reindent
This commit is contained in:
parent
a434c9be6a
commit
8d9c694025
1 changed files with 12 additions and 10 deletions
|
@ -1,16 +1,18 @@
|
|||
[user]
|
||||
name = Grigory Shipunov
|
||||
email = blame@oxapentane.com
|
||||
signingkey = 4C3CD96ED78251532AB5500AC688AC5B60F7A3A5
|
||||
name = Grigory Shipunov
|
||||
email = blame@oxapentane.com
|
||||
signingkey = 4C3CD96ED78251532AB5500AC688AC5B60F7A3A5
|
||||
[color]
|
||||
ui = auto
|
||||
ui = auto
|
||||
[merege]
|
||||
conflictstyle = diff3
|
||||
conflictstyle = diff3
|
||||
[commit]
|
||||
gpgsign = true
|
||||
gpgsign = true
|
||||
[credential]
|
||||
helper = cache --timeout 28800
|
||||
helper = cache --timeout 28800
|
||||
[alias]
|
||||
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
|
||||
diffstat = diff --stat
|
||||
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
|
||||
diffstat = diff --stat
|
||||
[pull]
|
||||
ff = only
|
||||
|
|
Loading…
Add table
Reference in a new issue