-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy path.gitconfig
75 lines (67 loc) · 1.6 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
[user]
name = Kian-Meng Ang
email = [email protected]
[alias]
a = add
ca = commit --amend -s
c = commit
cma = commit -a
cmam = commit -am
cfu = commit --fixup
co = checkout
com = checkout master
comi = checkout main
cob = checkout -b
cpn = cherry-pick -n
cs = commit -s
d = diff
dc = diff --cached
fu = fetch upstream
lg = log --graph --abbrev-commit \
--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
po = push origin
pom = push origin master
pomf = push origin master --force-with-lease
pr = pull --rebase
r = restore
rs = restore --staged
s = status
sw = switch
tl = "tag -l --sort=-creatordate --format='## %(refname:short) (%(creatordate:short))'"
url = remote -v
fu = fetch upstream
rim = rebase -i master
rimi = rebase -i main
rir = rebase -i --root
rum = rebase upstream/master
rumi = rebase upstream/main
rro = remote remove origin
rao = remote add origin
rau = remote add upstream
rru = remote remove upstream
[color]
branch = auto
diff = auto
status = auto
ui = auto
interactive = auto
[core]
whitespace = trailing-space,space-before-tab
editor = vim '+set tw=72'
excludesfile = ~/.gitignore_global
[merge]
tool = meld
[diff]
tool = icdiff
[difftool "icdiff"]
cmd = icdiff --line-numbers --highlight $LOCAL $REMOTE
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[pull]
rebase = true
[push]
default = current
[init]
defaultBranch = master
[rebase]
autoStash = true