ff on pull
This commit is contained in:
parent
21a9c58a17
commit
9f4f2ed7df
1 changed files with 1 additions and 0 deletions
|
|
@ -67,6 +67,7 @@
|
||||||
this = rev-parse --abbrev-ref HEAD
|
this = rev-parse --abbrev-ref HEAD
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = false
|
||||||
|
ff = true
|
||||||
[sendemail]
|
[sendemail]
|
||||||
smtpserver = mail.friedersdorff.com
|
smtpserver = mail.friedersdorff.com
|
||||||
smtpuser = max
|
smtpuser = max
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue