Browse Source

pull strategy add to config

84582af
Dirk Alders 1 year ago
parent
commit
d611d918b8
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      gitconfig

+ 2
- 1
gitconfig View File

@@ -5,4 +5,5 @@ git config --global user.email dirk@mount-mockery.de
5 5
 #
6 6
 git config --global diff.tool meld
7 7
 git config --global merge.tool meld
8
-git config --global --add difftool.prompt false
8
+git config --global --add difftool.prompt false
9
+git config --global pull.rebase false

Loading…
Cancel
Save