upsc-log-diff: +$line
[nethome.git] / .gitconfig
1 [user]
2         name = Jan Kratochvil
3         email = jan@jankratochvil.net
4 [include]
5         path = .gitconfig.local
6 [init]
7         defaultBranch = master
8 [merge]
9         conflictstyle = diff3
10 [color]
11         ui = never
12 [pull]
13         ff = only
14 #       rebase = true
15
16 # golang:
17 #[http]
18 #       cookiefile = /home/jkratoch/.gitcookies
19 [alias]
20         co = checkout
21         ci = commit
22         st = status
23         br = branch
24         hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
25 [pager]
26         branch = off
27 [branch]
28         sort = committerdate
29 # FIXME: It does not work:
30 #[blame]
31 #        ignoreRevsFile = ~/.gitconfig-ignoreblamecommit
32 [format]
33         signature =
34
35 # Big files cludge:
36 #[core]
37 #       compression=1
38 #       bigFileThreshold=100g
39 #[pack]
40 #       depth=2
41 #       window=2
42 #       threads=1