-
Notifications
You must be signed in to change notification settings - Fork 4
/
gitconfig
123 lines (108 loc) · 4.98 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
[alias]
# shortcuts (all deprecated in favor of shell aliases)
br = !deprecated 'Use gb' # branch
bra = !deprecated 'Use gbv ("git branch verbose")' # branch -avv
co = !deprecated 'Use gco' # checkout
cm = !deprecated 'Use gum ("git unmerged")' # cherry -v master
cp = !deprecated 'Use gcp' # cherry-pick
cpc = !deprecated 'Use gcpc' # cherry-pick --continue
cpo = !deprecated 'Use gcpo' # cherry-pick --strategy=recursive --strategy-option=ours
cpt = !deprecated 'Use gcpt' # cherry-pick --strategy=recursive --strategy-option=theirs
cl = !deprecated 'Use gcl' # clone
ci = !deprecated 'Use gc' # commit
cia = !deprecated 'Use gc!' # commit --amend
conflicts = !deprecated 'Use conflicts or conflicts!' # diff --no-prefix --name-only --diff-filter=U
db = !deprecated 'Use gdbl' # diff-blame
di = !deprecated 'Use gd or gd!' # diff --no-prefix
dif = !deprecated 'Use gd or gd!' # diff --no-prefix
dic = !deprecated 'Use gdcw or gdcw!' # diff --color-words --no-prefix
dicc = !deprecated 'Use gdcw. or gdcw.!' # diff --color-words --word-diff-regex=. --no-prefix
dis = !deprecated 'Use gds or gds!' # diff --staged --no-prefix
disc = !deprecated 'Use gdscw or gdscw!' # diff --staged --color-words --no-prefix
discc = !deprecated 'Use gdscw. or gdscw.!' # diff --staged --color-words --word-diff-regex=. --no-prefix
fa = !deprecated 'Use gfat' # !git fetch --all --prune && git fetch --all --tags
fb = !deprecated 'Use gfb' # filter-branch -f --prune-empty
fbi = !deprecated 'Use gfbi' # filter-branch -f --prune-empty --index-filter
fbs = !deprecated 'Use gfbs' # filter-branch -f --prune-empty --subdirectory-filter
fbt = !deprecated 'Use gfbt' # filter-branch -f --prune-empty --tree-filter
graph = !deprecated 'Use glog' # log --date-order --graph --decorate --oneline
lns = !deprecated 'Use glns' # log --name-status
follow = !deprecated 'Use glnsf' # log --name-status --follow
lp1 = !deprecated 'Use gll 1' # log -p -1
lp2 = !deprecated 'Use gll 2' # log -p -2
lp3 = !deprecated 'Use gll 3' # log -p -3
lp4 = !deprecated 'Use gll 4' # log -p -4
lp5 = !deprecated 'Use gll 5' # log -p -5
lp6 = !deprecated 'Use gll 6' # log -p -6
lp7 = !deprecated 'Use gll 7' # log -p -7
lp8 = !deprecated 'Use gll 8' # log -p -8
lp9 = !deprecated 'Use gll 9' # log -p -9
ff = !deprecated 'Use gff' # merge --ff --ff-only 'HEAD@{u}'
ffs = !deprecated 'Use gffs' # !git stash && git ff && git pop
ls = !deprecated 'Use gls' # ls-files
move = !deprecated 'Use gmv' # mv
ren = !deprecated 'Use gmv' # mv
rename = !deprecated 'Use gmv' # mv
pl = !deprecated 'Use gl' # pull
prb = !deprecated 'Use gup' # pull --rebase
ps = !deprecated 'Use gps' # !fix-git-remotes && git push
psf = !deprecated 'Use gpf or gpf!' # push --force
ra = !deprecated 'Use grba' # rebase --abort
rc = !deprecated 'Use grbc' # rebase --continue
ri = !deprecated 'Use grbi or gri' # rebase -i
ri1 = !deprecated 'Use gri 1' # rebase -i HEAD~1
ri2 = !deprecated 'Use gri 2' # rebase -i HEAD~2
ri3 = !deprecated 'Use gri 3' # rebase -i HEAD~3
ri4 = !deprecated 'Use gri 4' # rebase -i HEAD~4
ri5 = !deprecated 'Use gri 5' # rebase -i HEAD~5
ri6 = !deprecated 'Use gri 6' # rebase -i HEAD~6
ri7 = !deprecated 'Use gri 7' # rebase -i HEAD~7
ri8 = !deprecated 'Use gri 8' # rebase -i HEAD~8
ri9 = !deprecated 'Use gri 9' # rebase -i HEAD~9
rs = !deprecated 'Use grbs' # rebase --skip
ws = !deprecated 'Use gws' # rebase --whitespace=strip
ru = !deprecated 'Use grup or grup!' # remote update --prune
rhup = !deprecated 'Use grhup' # reset --hard 'HEAD@{u}'
pop = !deprecated 'Use gpop' # stash pop --index
st = !deprecated 'Use gst' # status
tags = !deprecated 'Use gtags' # !git fetch --tags && git tag -l
list-tags = !deprecated 'Use gtagsv'
wiki-clone = !deprecated 'Use wikiclone' # clone -c 'remote.origin.mediaimport=true' -c 'remote.origin.mediaexport=true' -c 'remote.origin.namespaces=(Main) File Template'
# new functions
fix = !deprecated 'Use gri'
ghr = !deprecated 'The ghr command is obsolete' # "!ghr() { git remote set-url origin git://github.com/$1 && git remote set-url --push origin [email protected]:$1; }; ghr"
pack = !deprecated 'Use gpack' # !git reset --hard && git for-each-ref --format='%(refname)' refs/original/ | xargs -n 1 git update-ref -d && git reflog expire --expire=now --all && git gc --aggressive --prune=now
spop = !deprecated 'Use gpop!' # !git checkout 'stash^{tree}' -- . && git stash drop
[core]
pager = less -FSX
[diff]
color = auto
tool = meld
[diff "spaceman-diff"]
command = spaceman-diff
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
[http]
cookiefile = ~/.gitcookies
[init]
defaultBranch = main
[merge]
tool = meld
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
#cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
[pull]
ff = only
[push]
default = upstream
[rebase]
autosquash = true
[ui]
color = auto