reindent
This commit is contained in:
parent
a434c9be6a
commit
8d9c694025
1 changed files with 12 additions and 10 deletions
|
@ -1,16 +1,18 @@
|
||||||
[user]
|
[user]
|
||||||
name = Grigory Shipunov
|
name = Grigory Shipunov
|
||||||
email = blame@oxapentane.com
|
email = blame@oxapentane.com
|
||||||
signingkey = 4C3CD96ED78251532AB5500AC688AC5B60F7A3A5
|
signingkey = 4C3CD96ED78251532AB5500AC688AC5B60F7A3A5
|
||||||
[color]
|
[color]
|
||||||
ui = auto
|
ui = auto
|
||||||
[merege]
|
[merege]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
[credential]
|
[credential]
|
||||||
helper = cache --timeout 28800
|
helper = cache --timeout 28800
|
||||||
[alias]
|
[alias]
|
||||||
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
||||||
diffw = diff --word-diff=color
|
diffw = diff --word-diff=color
|
||||||
diffstat = diff --stat
|
diffstat = diff --stat
|
||||||
|
[pull]
|
||||||
|
ff = only
|
||||||
|
|
Loading…
Add table
Reference in a new issue