-
Notifications
You must be signed in to change notification settings - Fork 7
/
Copy pathdot.gitconfig
157 lines (143 loc) · 4.75 KB
/
dot.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
# -*- mode: GitConfig -*-
# CORE
[core]
attributesfile = ~/.gitattributes_global
excludesfile = ~/.gitignore_global
whitespace = space-before-tab,trailing-space
mergeoptions = --no-edit
[tag]
sort = version:refname
# DIFF
[diff]
guitool = diffmerge
renames = true
mnemonicprefix = true
algorithm = patience
submodule = log
[diff "custom-yp-bin"]
textconv = hexdump -v -C
[diff "custom-yp-bz2"]
textconv = bzcat
# [diff "custom-yp-doc"] # https://github.com/git-for-windows/build-extra/blob/fe88392/git-extra/astextplain
# textconv = "!f(){ \
# antiword -m UTF-8 \"$1\" | sed \"s/\^M$//\; \
# }; f"
[diff "custom-yp-docx"] # https://github.com/git-for-windows/build-extra/blob/fe88392/git-extra/astextplain
textconv = "!f(){ \
docx2txt \"$1\" -; }; \
}; f"
[diff "custom-yp-exif"]
textconv = exiftool
[diff "custom-yp-gpg"]
textconv = gpg -v
[diff "custom-yp-gz"]
textconv = gzcat
[diff "custom-yp-odf"]
textconv = odt2txt
[diff "custom-yp-pdf"] # https://github.com/git-for-windows/build-extra/blob/fe88392/git-extra/astextplain
# textconv = "f(){ \
# pdftotext -layout -enc UTF-8 \"$1\" - | sed \"s/(\^M$)|(^\^L)//\" }; \
# }; f"
[diff "custom-yp-plist"]
textconv = plutil -convert xml1 -o -
cachetextconv = true
[diff "custom-yp-tar"]
textconv = tar -O -xf
[diff "custom-yp-tar-bz2"]
textconv = tar --bzip2 -O -xf
[diff "custom-yp-tar-gz"]
textconv = tar --gzip -O -xf
[diff "custom-yp-tar-xz"]
textconv = tar --xz -O -xf
[diff "custom-yp-xz"]
textconv = xzcat
[diff "custom-yp-zip"]
textconv = unzip -p
[difftool]
prompt = false
[difftool "diffmerge"]
cmd = diffmerge --nosplash \"$LOCAL\" \"$REMOTE\"
# MERGE
[merge]
autostash = true
guitool = diffmerge
log = true
summary = true
stat = true
ff = false
renormalize = true # false
[merge "ours"]
driver = true
[mergetool]
prompt = false
keepBackup = false
trustExitCode = false
[mergetool "diffmerge"]
# cmd = diffmerge --nosplash --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
cmd = diffmerge --nosplash --merge --result=\"$MERGED\" -t1=\"Local version\" -t2=\"$MERGED\" -t3=\"Other version\" --caption=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
# REBASE
[rebase]
autostash = true
autosquash = true
keepEmpty = true
stat = true
missingCommitsCheck = warn
# URL
[branch]
autosetupmerge = true
autosetuprebase = always
# FILTERS
[filter "git-lfs"]
smudge = git-lfs smudge -- %f
clean = git-lfs clean -- %f
required = true
process = git-lfs filter-process
[filter "custom-yp-plist"]
clean = plutil -convert xml1 -o - -
smudge = plutil -convert binary1 -o - -
# MISC
[advice]
detachedHead = false
[blame]
# FIXME git fails if ignoreRevsFile doesn't exist. Ongoing discussions to mark it as optional
# see https://www.spinics.net/lists/git/msg415935.html
# ignoreRevsFile = .git-blame-ignore-revs
# https://www.spinics.net/lists/git/msg415950.html
# ignoreRevsFileIsOptional = true
# https://www.spinics.net/lists/git/msg415951.html
# ignoreRevsFile = :(optional).git-blame-ignore-revs
[gc]
auto = 0
[init]
defaultBranch = master
[log]
date = iso
follow = true
[notes]
displayRef = refs/notes/*
rewriteref = refs/notes/*
rewriteMode = concatenate
[notes "rewrite"]
amend = true
rebase = true
[pull]
default = current
rebase = merges # rebase and preserve merge commits
[push]
default = current
followTags = true
[rerere]
autoupdate = true
enabled = true
[status]
submoduleSummary = true
relativePaths = true
[submodule]
recurse = true
[svn]
rmdir = true
[tar "tar.bz2"]
command = bzip2 -c
[tar "tar.xz"]
command = xz -c