-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
158 lines (129 loc) · 4.19 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
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
[user]
name = x
email = x
###### my custom config for git command line
[push]
default = current
[core]
trustctime = false
##### Editor
# Mac, Linux
# editor = nano
# Windows
editor = \"C:\\Users\\<X>\\AppData\\Local\\Programs\\Microsoft VS Code\\bin\\code\" --wait
filemode = false
##### auto CLRF option
# Mac, Linux (convert only on commit - CRLF might be introduced)
# autocrlf = input
# Windows (convert on checkout and commit)
autocrlf = true
[color]
ui = true
branch = auto
diff = auto
status = auto
[merge]
conflictstyle = diff3
[rerere]
enabled = 1
[color "branch"]
current = red reverse bold
local = magenta
remote = white
[color "diff"]
meta = yellow
frag = magenta
old = red bold
new = green
plain = white
[color "status"]
added = green
changed = yellow
untracked = red bold
[alias]
st = status -s
c = commit
cm = commit -m
cma = commit -a -m
ca = commit --amend
amend = commit --amend
caa = commit -a --amend -C HEAD
caf = "!f() { git add "$1" && git commit --amend --no-edit; }; f"
filelog = log -u
fl = log -u
ai = add --interactive
co = checkout
br = branch
#"!git branch -ra | grep -v done"
bra = branch -ra
#list commands
l = log --pretty=format:"%C(green)%h\\ %C(yellow)%ad%Cred%d\\ %Creset%s%C(magenta)\\ [%cn]" --decorate --date=short --graph
ls = log --pretty=format:"%C(green)%h%C(yellow)%d\\ %Creset%s%C(magenta)\\ [%cn]" --graph --decorate --numstat --oneline
ls1 = log --pretty=oneline
lds = log --pretty=format:"%C(green)%h\\ %C(red)[%ad]%C(yellow)%d\\ %Creset%s%C(magenta)\\ [%cn]" --decorate --date=relative
logd = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
lc = "!f() { git ll "$1"^.."$1"; }; f"
lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
#list all aliases
la = "!git config -l | grep alias | cut -c 7-"
d = diff --word-diff
dc = diff --word-diff --cached
#list modified files in last commit
dl = "!git ll -1"
#diff last commit
dr = "!f() { git diff "$1"^.."$1"; }; f"
dlc = diff --cached HEAD^
drw = "!f() { git diff -w "$1"^.."$1"; }; f"
branch = branch -ra
#reset commands
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
#git svn
svnr = svn rebase
svnd = svn dcommit
svnl = svn log --oneline --show-commit
#stash
sl = stash list
sa = stash apply
ss = stash save
cp = cherry-pick
grep = grep -Ii
gr = grep -Ii
#grep from root folder
gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"
#grep on filename
f = "!git ls-files | grep -i"
#rename branch tree to done-
done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f"
#assume aliases
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
#show assumed files
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
#unassume all the assumed files
unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged"
assumeall = "!git st -s | awk {'print $2'} | xargs git assume"
lasttag = describe --tags --abbrev=0
lt = describe --tags --abbrev=0
#merges
ours = "!f() { git co --ours $@ && git add $@; }; f"
theirs = "!f() { git co --theirs $@ && git add $@; }; f"
#list remotes
rem="!git config -l | grep remote.*url | tail -n +2"
#apply patch from other local repo
lap = "!f() { git --git-dir=$1 format-patch -k -1 --stdout $2 | git am -3 -k; }; f"
#subtree add
sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f"
# initial empty commit
empty = "!git commit -am\"[empty] Initial commit\" --allow-empty"
[pull]
rebase = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true