-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
86 lines (85 loc) · 2.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
[alias]
s = status
l = log --pretty=oneline -n 20 --graph --abbrev-commit
tags = tag -l
branches = branch -a
remotes = remote -v
amend = commit --amend --reuse-message=HEAD
contributors = shortlog --summary --numbered
log = log --decorate --graph --relative-date --stat
hist = log --graph --pretty=format:'%Cred%h%Creset %s%C(yellow)%d%Creset %Cgreen(%cr)%Creset [%an]' --abbrev-commit --date=relative
d = difftool
uncommit = reset --soft HEAD~
co = checkout
unstage = reset HEAD --
last = log -1 HEAD -p
commit = commit -v
merged = branch --merged
unmerged = branch --no-merged
diffc = diff --check
diffs = diff --staged
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = !git ls-files -v | grep ^h | cut -c 3-
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
snapshots = !git stash list --grep snapshot
ours = !git checkout --ours $@ && git add $@
theirs = !git checkout --theirs $@ && git add $@
addp = add --patch
filelog = log -u
bsort = branch --sort=-committerdate | tail -r
pr = "!f() { git log --merges --ancestry-path --oneline $1..master | grep 'pull request' | tail -n1 | awk '{ print $5 }'; }; f"
ctags = !.git/hooks/ctags
[color]
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[apply]
whitespace = fix
[user]
name = XYZ
email = [email protected]
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[diff]
tool = vimdiff
renames = copies
submodule = log
mnemonicprefix = true
algorithm = patience
[difftool]
prompt = false
[core]
editor = /usr/local/bin/vim
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
autocrlf = false
excludesfile = /Users/mo/.global_ignore
[push]
default = matching
[commit]
; gpgsign = true
[pull]
rebase = true
[rerere]
enabled = true
[merge]
conflictstyle = diff3
[status]
submodulesummary = 1
[help]
autocorrect = 15
# vim:ft=gitconfig