blob: ff2d46b1bbc9046633553c722fde6610b9f93261 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
[user]
name = Alex Scerba
email = alex@scerba.org
signingkey = alex@scerba.org
#[commit]
# gpgsign = true
#[tag]
# gpgSign = true
[color]
ui = true
[init]
defaultBranch = master
[core]
hooksPath = ~/.config/git/hooks
[alias]
l = log --all --oneline --graph --decorate
[pull]
# rebase = true
[merge]
conflictstyle = zdiff3
ff = only
[diff]
algorithm = histogram
|
