Have to test those new fancy things.
This commit is contained in:
parent
a0a1103ba9
commit
9edb5d124f
|
@ -12,9 +12,15 @@
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
|
||||||
|
[rerere]
|
||||||
|
enabled = true
|
||||||
|
|
||||||
[pull]
|
[pull]
|
||||||
ff = only
|
ff = only
|
||||||
|
|
||||||
|
[diff]
|
||||||
|
algorithm = histogram
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
ap = add -p
|
ap = add -p
|
||||||
b = branch
|
b = branch
|
||||||
|
@ -36,7 +42,9 @@
|
||||||
[merge "po3way"]
|
[merge "po3way"]
|
||||||
name = po file merge driver
|
name = po file merge driver
|
||||||
driver = po3way --debug --git-merge-driver -- %A %O %B
|
driver = po3way --debug --git-merge-driver -- %A %O %B
|
||||||
|
|
||||||
[branch]
|
[branch]
|
||||||
sort = -committerdate
|
sort = -committerdate
|
||||||
|
|
||||||
[column]
|
[column]
|
||||||
ui = auto
|
ui = auto
|
||||||
|
|
Loading…
Reference in New Issue