aboutsummaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2020-06-25 11:11:48 +0200
committerCharles <sircharlesaze@gmail.com>2020-06-25 11:11:48 +0200
commitd2d092335ac8bd9076f46128efec4de70bc49640 (patch)
treed6b60f741ebd3a293db88d27ab35b7a8d2c3cf34 /.gitconfig
parent800b3c5f0a8e773e3e0f18f262eb4c3c485b21b4 (diff)
downloaddotfiles-d2d092335ac8bd9076f46128efec4de70bc49640.tar.gz
dotfiles-d2d092335ac8bd9076f46128efec4de70bc49640.tar.bz2
dotfiles-d2d092335ac8bd9076f46128efec4de70bc49640.zip
Added my header
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 2aa7aac..88672f3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,3 +6,7 @@
username = HappyTramp
[log]
decorate = full
+[pull]
+ rebase = false
+[merge]
+ tool = vimdiff