Add git config pull.ff only · 3fd1c18cec - dotfiles-mirror - Gitea: Git with a cup of tea

Add git config pull.ff only

master

10sr 6 years ago

parent

fcab51327f

commit

3fd1c18cec

1 changed files with 1 additions and 0 deletions

Unified View

							
								+ 1
								
								- 0
							
MakefileView File
								
																@@ -305,6 +305,7 @@ else
															
																	$(git_conf) status.showUntrackedFiles normal
																
																	$(git_conf) status.showUntrackedFiles normal
															
																	$(git_conf) log.date iso
																
																	$(git_conf) log.date iso
															
																	$(git_conf) push.default current
																
																	$(git_conf) push.default current
															
																	$(git_conf) pull.ff only
															
																ifneq (,$(xz))
																
																ifneq (,$(xz))
															
																	$(git_conf) tar.txz.command "xz -c"
																
																	$(git_conf) tar.txz.command "xz -c"
															
																endif
																
																endif