aboutsummaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig9
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitconfig b/.gitconfig
index f442193..9400d9f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,6 +2,9 @@
name = Luca Matei Pintilie
signingKey = CA875B8CE4FF7C9F
+[pull]
+ rebase = false
+
[commit]
gpgSign = true
@@ -24,8 +27,10 @@
diffFilter = delta --color-only
[delta]
- navigate = true # use n and N to move between diff sections
- light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
+ # use n and N to move between diff sections
+ navigate = true
+ # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
+ light = false
[merge]
conflictstyle = diff3