Set git branch.autoSetupMerge to always · d9f557987d - dotfiles-mirror - Gitea: Git with a cup of tea

Set git branch.autoSetupMerge to always

master

10sr 5 years ago

parent

37cf403d80

commit

d9f557987d

Signed by:

10sr GPG Key ID: 7BEC428194130EB2

1 changed files with 1 additions and 0 deletions

Split View

							
								+ 1
								
								- 0
							
MakefileView File
								
			@@ -301,6 +301,7 @@ 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