-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
88 lines (88 loc) · 2.18 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
[include]
path = .gitconfig.user
[core]
editor = vi
autocrlf = Input
[color]
ui = true
diff = true
[log]
decorate = none
[alias]
co = checkout
st = status
man = help
mt = mergetool
fo = fetch origin
f = fetch
changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
grep = log --all --oneline --grep
l = log
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>' --abbrev-commit --date=relative
lgf = log --follow
ll = log -1
bl = blame
bc = branch --all --contains
b = branch
rh = reset --hard
unstage = reset HEAD
uncommit = reset --soft HEAD^
sf = submodule foreach
su = submodule update
pf = pull --ff-only
c = commit
ca = commit --amend
wip = commit -m WIP
cp = cherry-pick -x
cpc = cherry-pick --continue
cpa = cherry-pick --abort
rc = rebase --continue
rbc = rebase --continue
dt = difftool
serve = daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/
ri = rebase -i
cm = commit -m
au = add -u
ra = rebase --abort
pr = pull --rebase
dtc = difftool --cached
d = diff
dc = diff --cached
lga = !git lg --all
ignore = !git checkout gitignore -- .gitignore && git reset HEAD .gitignore
[blame]
date = iso
[push]
default = simple
[receive]
denyDeleteCurrent = warn
[rerere]
enabled = true
autoupdate = true
[diff]
tool = bc4
renames = true
mnemonicprefix = true
algorithm = patience
guitool = beyondcompare3
[difftool]
prompt = false
[difftool "bc4"]
cmd = \"C:/Program Files/Beyond Compare 4/BCompare.exe\" \"$LOCAL\" \"$REMOTE\"
[difftool "vsdiff"]
cmd = \"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
keepbackup = false
trustexistcode = true
[merge]
summary = true
tool = bc4
renamelimit = 10000
[mergetool]
prompt = false
[mergetool "bc4"]
cmd = \"C:/Program Files/Beyond Compare 4/BCompare.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[mergetool "vsmerge"]
cmd = \"C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
keepbackup = false
trustexistcode = true