-
Notifications
You must be signed in to change notification settings - Fork 3
/
gitconfig
94 lines (86 loc) · 2.33 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
[user]
name = Martin Renold
email = [email protected]
[color]
ui = true
#ui = always
#diff = auto
status = always
#branch = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = 11
frag = magenta bold
old = red bold
new = green bold
commit = yellow bold
whitespace = red reverse
func = 146 bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
st = status
ci = commit
br = branch
co = checkout
ls = ls-files
cp = cherry-pick
pick = cherry-pick
ann = annotate
unstage = reset HEAD
unstash = stash pop
w = whatchanged
ds = !git --no-pager diff --stat -M -w HEAD
# from http://stackoverflow.com/questions/267761/what-does-your-gitconfig-contain
# show list of contributors in descending order by number of commits
rank = shortlog -sn --no-merges
# given a string for an author, try to figure out full name and email:
whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
# given any git object, try to show it briefly
whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
staged = diff --cached
[core]
excludesfile = /home/martin/.gitignore
pager = diff-so-fancy | less --tabs=4 -RFX
[giggle]
compact-mode = false
main-window-maximized = false
main-window-geometry = 1272x993+0+0
main-window-view = HistoryView
file-view-vpane-position = 391
history-view-vpane-position = 338
[cola]
fontdiff = Bitstream Vera Sans Mono,13,-1,5,50,0,0,0,0,0
fontui = Nimbus Sans L,13,-1,5,50,0,0,0,0,0
[gui]
fontui = -family \"DejaVu Sans\" -size 14 -weight normal -slant roman -underline 0 -overstrike 0
fontdiff = -family \"DejaVu Sans Mono\" -size 14 -weight normal -slant roman -underline 0 -overstrike 0
[rerere]
enabled = 1
[advice]
statusHints = false
detachedHead = false
pushNonFastForward = false
[url "git://git.debian.org/d-i/"]
insteadOf = git+ssh://git.debian.org/git/d-i/
[push]
default = simple
[merge]
conflictstyle = diff3
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[init]
defaultBranch = main