git.lirion.de

Of git, get, and gud

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormail_redacted_for_web 2022-03-24 15:12:28 +0100
committermail_redacted_for_web 2022-03-24 15:12:28 +0100
commitbdb326f2ae8a0550c3ce764c937a8f4399c8767f (patch)
tree75bc51918b4064c991e0134f70718fb16643e860
parente7028f317e4319902de85bc1361c8bf7fb70e693 (diff)
downloaddotfiles-bdb326f2ae8a0550c3ce764c937a8f4399c8767f.tar.bz2
+default pull strategy: no rebase
-rw-r--r--.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 03c43af..bcad741 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -75,3 +75,5 @@
# program = /usr/bin/gpg2
[http]
#proxy = http://10.0.0.1:3128/
+[pull]
+ rebase = false