summaryrefslogtreecommitdiff
path: root/git/.gitconfig
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2020-06-19 17:17:00 +0200
committerUrbain Vaes <urbain@vaes.uk>2020-06-19 17:17:00 +0200
commit5e5aa0b9f9b0b19472af001ea07d1c49b230dac6 (patch)
tree277c63dd0ccca5a2a7f05f693b5e00f6bf3dbf6c /git/.gitconfig
parente59f7de19940b3b2740be7464f97902fe6ef7179 (diff)
Add git pull configuration
Diffstat (limited to 'git/.gitconfig')
-rw-r--r--git/.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 0e7df50..738c719 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -19,3 +19,5 @@
default = simple
[merge]
ff = true
+[pull]
+ rebase = false