summaryrefslogtreecommitdiff
path: root/gitconfig-wmf
diff options
context:
space:
mode:
authorLars Wirzenius <lwirzenius@wikimedia.org>2021-04-20 13:21:43 +0300
committerLars Wirzenius <lwirzenius@wikimedia.org>2021-04-20 13:21:43 +0300
commit98dccfcd49687658ed69a245a1fb3bd2515a7bab (patch)
treeb372fa30c9e67932508ae6c53443c0529f3e7d8a /gitconfig-wmf
parent293618815fe6189913d100b42d9f7a5d0935c029 (diff)
downloadliw-dot-files-98dccfcd49687658ed69a245a1fb3bd2515a7bab.tar.gz
git: rebase on pull
Diffstat (limited to 'gitconfig-wmf')
-rw-r--r--gitconfig-wmf2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig-wmf b/gitconfig-wmf
index ec57c42..8761795 100644
--- a/gitconfig-wmf
+++ b/gitconfig-wmf
@@ -11,6 +11,8 @@
pushInsteadOf = git://git.liw.fi/
[color]
ui = auto
+[pull]
+ rebase = true
[push]
default = simple