public/mk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add --ff-only to 'git pull ...' command line

Browse Source
This commit is contained in:
Kai Tetzlaff (moka.tetzco.de) 2021-02-05 15:12:23 +01:00
parent 161d198f7f
commit 093db6b1dc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vcs.mk
View File

@ -138,7 +138,7 @@ define GIT_TMPL
@echo +++ Updating[git]: $$(patsubst pull-%,%,$$@) $(SHQ)($2$(SHQ)) @echo +++ Updating[git]: $$(patsubst pull-%,%,$$@) $(SHQ)($2$(SHQ))
@echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
$$(pre_up_cmd-$1) $$(pre_up_cmd-$1)
cd $1 && $(GIT) pull $(GITPULL_FLAGS) cd $1 && $(GIT) pull --ff-only $(GITPULL_FLAGS)
$$(post_up_cmd-$1) $$(post_up_cmd-$1)
endif endif