aboutsummaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorLuca Matei Pintilie <lucafulger@gmail.com>2023-02-05 10:08:11 +0000
committerLuca Matei Pintilie <lucafulger@gmail.com>2023-02-05 10:08:11 +0000
commit1ca6f778e8c983950f5b05f2a84f1452fb99451d (patch)
treef0cc91abe372152f5609249920574f4151ca03ee /.gitconfig
parentc24569217169ea9eea8d395afb5971056e7cd4b3 (diff)
downloaddotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.gz
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.bz2
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.lz
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.xz
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.tar.zst
dotfiles-1ca6f778e8c983950f5b05f2a84f1452fb99451d.zip
Better i3 exit prompt
Diffstat (limited to '')
-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