Ensure git pulls aren't rebased automatically
This commit is contained in:
parent
cbf1228ad9
commit
1d045865a4
1 changed files with 3 additions and 0 deletions
|
@ -14,6 +14,9 @@
|
||||||
[commit]
|
[commit]
|
||||||
verbose = true
|
verbose = true
|
||||||
|
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
root = rev-parse --show-toplevel
|
root = rev-parse --show-toplevel
|
||||||
amend = commit --amend --no-edit
|
amend = commit --amend --no-edit
|
||||||
|
|
Loading…
Reference in a new issue