chiark
/
gitweb
/
~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
dot/gitconfig.in: Add explicit `pull' setting.
[profile]
/
dot
/
gitconfig.in
diff --git
a/dot/gitconfig.in
b/dot/gitconfig.in
index 17cf5ae7e267e196c2a56876da354fcb3227e8fb..20235cb162b2466031d5ce19ca3f997777c3e4ae 100644
(file)
--- a/
dot/gitconfig.in
+++ b/
dot/gitconfig.in
@@
-40,6
+40,9
@@
[rebase]
autosquash = true
+[pull]
+ rebase = false
+
[push]
default = upstream
followTags = true