forked from driesvints/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
387 lines (291 loc) · 11.8 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
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
[init]
templatedir = ~/.dotfiles/.git-templates
[user]
name = Alan Voiski
email = [email protected]
[alias]
# List aliases
aliases = config --get-regexp alias
# Amend the currently staged files to the latest commit
amend = commit --amend --reuse-message=HEAD
# Get current branch
branch-current = "!f(){ \
local branch=$(git rev-parse --abbrev-ref HEAD); \
[ $branch = 'HEAD' ] && git rev-parse --short HEAD \
|| echo $branch; \
}; f #"
# Retrieve default branch - expect main
branch-default = "!f(){ \
if [[ $1 == 'long' ]]; \
then git symbolic-ref refs/remotes/origin/HEAD; \
else git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'; \
fi; \
}; f"
# Remove branches that have already been mergeith main
# a.k.a. ‘delete merged’
branch-delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
# Delete current branch and fetch default branch
branch-delete="!f(){ \
declare currentBranch=$(git branch-current); \
echo Delete ${currentBranch}?[y]; \
read option; \
if [ ${option} = 'y' ]; then \
local -r target=${1:-origin/$(git branch-default)}; \
git fetch --all --prune && \
git checkout ${target} && \
( [[ "${target}" = "origin/"* ]] || git pull) && \
git branch -D ${currentBranch}; \
fi; \
}; f"
# Push to updstream
branch-push="!git push --set-upstream origin $(git branch-current) #"
# Branches by its last update
branch-report="!git for-each-ref --sort=committerdate --exclude='refs/tags/*' \
--format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))' #"
# Branches by its last update
branch-report-older="!f(){\
local -r range=${1:-6m}; \
git for-each-ref --sort=committerdate --exclude='refs/tags/*' \
--format='%(authordate:format:%Y-%m-%d) %(align:25,left)%(authorname)%(end) [%(refname:strip=3)]' \
| grep -v '\\[\\]' \
| awk \"{ \
if (\\$1 < \\\"$(date -v -${range} +'%Y-%m-%d')\\\") { \
print \\$0 \
} \
}\"; \
}; f"
# Table of branches by its last update
# https://stackoverflow.com/a/5188364/2985644
branch-report-fancy= "!f() { \
refbranch=$(git branch-default long) \
mode=--short \
limit=${2:-20} \
head='ahead|behind|branch|lastcommit\n' \
format='%(refname:short)|%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)%(color:reset)'; \
case ${1} in \
--full|--long) \
mode=$1; \
head='ahead|behind|branch|lastcommit|message|author\n'; \
format='%(refname:short)|%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)'; \
;; \
[1-9]*) limit=${1};; \
*) echo '> Also check for --full mode';; \
esac; \
echo \"Printing Mode/Limit ${mode}/${limit}\" ;\
git for-each-ref \
--sort=-committerdate \
--exclude='refs/tags/*' \
--format=\"${format}\" \
--color=always \
--count=${limit} \
| while read line; do \
branch=$(\
echo \"$line\" \
| awk 'BEGIN { FS = \"|\" }; { print $1 }' \
| tr -d '*' \
); \
ahead=$(git rev-list --count \"${refbranch}..${branch}\"); \
behind=$(git rev-list --count \"${branch}..${refbranch}\"); \
colorline=$(echo \"$line\" | sed 's/^[^|]*|//'); \
echo \"$ahead|$behind|$colorline\" | awk -F'|' -vOFS='|' '{$5=substr($5,1,70)}1' ; \
done \
| ( echo \"${head}\" && cat) \
| column -ts'|'; \
}; f"
# Update branch with repo main branch
branch-update = !"git fetch-all && git rebase origin/$(git branch-default)"
# Show verbose output
branches = branch -a
# Clone a repository including all submodules
c = clone --recursive
# Commit all changes
ca = !git add -A && git commit -av
# List contributors with number of commits
contributors = shortlog --summary --numbered
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
# Show the diff between the latest commit and the current state
d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
# `git di $number` shows the diff between the state `$number` revisions ago and the current state
di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
# Fetch all and prune
fetch-all = fetch --prune --tags --force origin
# Find branches containing commit
find-branch = fb
fb = "!f() { git branch -a --contains $1; }; f"
# Find commits by source code
find-code = fc
fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
# Find commits by commit message
find-message = fm
fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
# Find tags containing commit
find-tag = ft
ft = "!f() { git describe --always --contains $1; }; f"
# Open github diff for the current branch
gitdiff="!open https://$(git repo-server)/$(git repo-path)/compare/$(git branch-current) #"
# Open github for the current branch
github = gh
gh = "!open https://$(git repo-server)/$(git repo-path)/tree/$(git branch-current) #"
# Switch to a branch, creating it if necessary
go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
# Animated grapth of current grapth
gource="!gource -s 0.5 --hide dirnames,filenames --follow-user \"$(git config user.name)\" #"
# View full history in colorized/fancy log
history = log --graph --full-history --all --color --pretty=format:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s"
# Install pre commit message template in existing local repo
install-commit-template = !ln -fs ~/.dotfiles/.git-templates/hooks/prepare-commit-msg .git/hooks/prepare-commit-msg
# View abbreviated SHA, description, and history graph of the latest 20 commits
l = log --pretty=oneline -n 20 --graph --abbrev-commit
# Merge GitHub pull request on top of the current branch
# if a branch name is specified, on top of the specified branch
merge-pr = mpr
mpr = "!f() { \
declare currentBranch=\"$(git symbolic-ref --short HEAD)\"; \
declare branch=\"${2:-$currentBranch}\"; \
if [ $(printf \"%s\" \"$1\" | grep '^[0-9]\\+$' > /dev/null; printf $?) -eq 0 ]; then \
git fetch origin refs/pull/$1/head:pr/$1 && \
git checkout -B $branch && \
git rebase $branch pr/$1 && \
git checkout -B $branch && \
git merge pr/$1 && \
git branch -D pr/$1 && \
git commit --amend -m \"$(git log -1 --pretty=%B)\n\nCloses #$1.\"; \
fi \
}; f"
# Pull in remote changes for the current repository and all its submodules
p = !"git pull; git submodule foreach git pull origin master"
# Open pr entry for the current branch
pr="!f(){\
if [[ $(git repo-server) =~ gitlab ]]; \
then open https://$(git repo-server)/$(git repo-path)/compare/$(git branch-default)...$(git branch-current);\
else open https://$(git repo-server)/$(git repo-path)/compare/$(git branch-current)?expand=1;\
fi \
}; f"
# Interactive rebase with the given number of latest commits
reb = "!r() { git rebase -i HEAD~$1; }; r"
# Show verbose output
remotes = remote -v
# Get repo name
repo-name = "!x=$(git remote get-url origin) && x=$(basename $x) && echo ${x/.git/} #"
# Get repo server
repo-server = "!x=$(git remote get-url origin) && \
[[ $x = *@* ]] \
&& echo $x | cut -d'@' -f2 | cut -d':' -f1 \
|| echo $x | cut -d'/' -f3 | cut -d':' -f1"
# Get repo user
repo-user = "!declare remote_url=$(git remote get-url origin);remote_url=$(dirname ${remote_url##*:});basename ${remote_url} #"
# Get repo path
repo-path = "!declare remote_url=$(git remote get-url origin);remote_url=${remote_url##*:};echo ${remote_url%%.git} #"
# Remove the old tag with this name and tag the latest commit with it.
retag = "!r() { git tag -d $1 && git push origin :refs/tags/$1 && git tag $1; }; r"
# View the current working tree status using the short format
s = status -s
# I like sourcetree, more then 'git gui'
source="!/Applications/SourceTree.app/Contents/Resources/stree ."
# list objts by size https://stackoverflow.com/a/42544963/2985644
size = !"git rev-list --objects --all | \
git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | \
sed -n 's/^blob //p' | \
sort --numeric-sort --key=2 | \
cut -c 1-12,41- | \
$(command -v gnumfmt || echo numfmt) --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest"
# Show verbose output
tags = tag -l
[apply]
# Detect whitespace errors when applying a patch
whitespace = fix
[core]
# Make `git rebase` safer on macOS
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false
# Prevent showing files whose names contain non-ASCII symbols as unversioned.
# http://michael-kuehnel.de/git/2014/11/21/git-mac-osx-and-german-umlaute.html
precomposeunicode = false
# Speed up commands involving untracked files such as `git status`.
# https://git-scm.com/docs/git-update-index#_untracked_cache
untrackedCache = true
# Use sublime as editor
editor = subl -n -w
# Global ignore OS/compilation/packages files
excludesfile = ~/.dotfiles/.gitignore_global
[color]
# Use colors in Git commands that are capable of colored output when
# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold # line info
old = red # deletions
new = green # additions
[color "status"]
added = yellow
changed = green
untracked = cyan
[commit]
# https://help.github.com/articles/signing-commits-using-gpg/
gpgsign = true
[diff]
# Detect copies as well as renames
renames = copies
[diff "bin"]
# Use `hexdump` to diff binary files
textconv = hexdump -v -C
[help]
# Automatically correct and execute mistyped commands
# autocorrect = 1
[merge]
# Include summaries of merged commits in newly created merge commit messages
log = true
tool = kdiff3
[mergetool]
# Skip question, use kdiff3
prompt = false
keepBackup = false
keepTemporaries = false
# [mergetool "kdiff3"]
# Skip meld exit code confirmation
# trustExitCode = true
# Config meld to properly get diff order
# cmd = open -W -a Meld --args --auto-merge \"$(pwd)/$LOCAL\" \"$(pwd)/$BASE\" \"$(pwd)/$REMOTE\" --output=\"$(pwd)/$MERGED\"
[diff]
tool = kdiff3
[difftool]
prompt = false
keepBackup = false
trustExitCode = false
# [difftool "kdiff3"]
# path
[push]
# https://git-scm.com/docs/git-config#git-config-pushdefault
default = simple
# Make `git push` push relevant annotated tags when pushing branches out.
followTags = true
[pull]
# puth your changes after the remote state - it keeps a shinning branch timeline, trust me.
rebase = true
# URL shorthands
[url "[email protected]:"]
insteadOf = "gh:"
insteadOf = "https://github.com/"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
pushInsteadOf = "https://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "git://gist.github.com/"]
insteadOf = "gist:"
# Sourcetree default configuration
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
## check more here https://github.com/voiski/dotfilesconfidential
[include]
path = ~/.dotfiles/dotfilesconfidential/.gitconfig