summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2022-11-29 17:04:27 -0600
committerluxagraf <sng@luxagraf.net>2022-11-29 17:04:27 -0600
commitbca68ebf2db96a255b734b94a61f6c04fdee2d5e (patch)
tree16192a6031561fc551d9da61c688f43c45485d4c /.gitconfig
parent033d3f11db8f7afcd8a6ae202b097b5d931ec052 (diff)
latest sway changes from HP
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 13c549f..357500b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,3 +3,5 @@
name = luxagraf
[gpg]
program = gpg2
+[pull]
+ rebase = false