Do not rebase on pull
This commit is contained in:
parent
8e88420938
commit
3b9e007836
1 changed files with 3 additions and 0 deletions
|
@ -60,3 +60,6 @@
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
template = ~/.git_commit_msg.txt
|
template = ~/.git_commit_msg.txt
|
||||||
|
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|
Loading…
Reference in a new issue