10sr
/
dotfiles-mirror
mirror of https://github.com/10sr/dotfiles.git
1
0
Fork 0
Code Issues 0 Releases 0 Wiki Activity
Browse Source

Revert "Set git branch.autoSetupMerge to always" 

This reverts commit d9f557987d.
master
10sr 5 years ago
parent
d9f557987d
commit
4b944e05af
Signed by: 10sr GPG Key ID: 7BEC428194130EB2
1 changed files with 0 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -1
      Makefile

+ 0
- 1
Makefile View File

@@ -301,7 +301,6 @@ else
$(git_conf) fetch.pruneTags true
$(git_conf) push.default current
$(git_conf) pull.ff only
$(git_conf) branch.autoSetupMerge always
ifneq (,$(xz))
$(git_conf) tar.txz.command "xz -c"
endif


Write Preview
Loading…
Cancel
Save