-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
94 lines (94 loc) · 2.54 KB
/
.gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
[include]
path = ~/secret/.gitconfig
[core]
excludesfile = ~/.gitignore_global
attributesFile = ~/.gitattributes
editor = $EDITOR
pager = less -R
[help]
format = man
[alias] #TODO move all shell commands to own files
aa = add --all .
au = add --update
br = branch
branch-name = symbolic-ref --short HEAD
ci = commit --verbose
cia = commit --amend
cl = clone --recurse-submodules
co = checkout
d = difftool
fa = fetch --all
fp = push --force --verbose --progress
fp-dev = ! git push origin +`git branch-name`:develop
l = log --all --graph --abbrev-commit --date=local --date=iso-strict --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%ad%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
nuke = ! git reset . && git checkout . && git clean -fd .
prune-merged = gone -d
pu = up
pullreq = ! hub pull-request -m `git branch-name` -b `git-default-branch`
rb = rebase
rbi = rebase --interactive --rebase-merges
root = rev-parse --show-toplevel
shallow = clone --depth 1 --recurse-submodules --shallow-submodules --no-tags
su = submodule update --init --recursive
sub = submodule
sup = ! git stash && git up && git stash pop
[init]
templatedir = ~/.git-templates
defaultBranch = main
[fetch]
parallel = 0
prune = true
pruneTags = true
recurseSubmodules = on-demand
[push]
default = current
followTags = false
[pull]
rebase = false
[submodule]
fetchJobs = 0
[difftool]
prompt = false
tool = vimdiff
[difftool "vimdiff"]
cmd = vim -d \"$LOCAL\" \"$REMOTE\"
[merge]
tool = vimdiff
conflictstyle = diff3
[rebase]
autostash = true
[mergetool]
prompt = false
conflictstyle = diff3
keepBackup = false
[mergetool "vimdiff"]
cmd = vim -d \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c '$wincmd w' -c 'wincmd J'
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[filesystem "AdoptOpenJDK|1.8.0_242|/dev/disk1s1"]
timestampResolution = 1001 milliseconds
minRacyThreshold = 0 nanoseconds
[commit]
gpgsign = true
[tag]
forceSignAnnotated = true
[gui]
pruneDuringFetch = true
[trace2]
eventTarget = af_unix:/Users/andre/.gittrace/trace.sock
eventBrief = true
eventNesting = 1
configparams = custom.metacommands
[lfs]
concurrenttransfers = 8
[pack]
threads = 8
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true