matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

++ &&

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-07-09 17:24:22 +02:00
commit ce27012d62
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -189,10 +189,9 @@ $(GIT_TAG_FILE):
#git-branch-merge: git-tag #git-branch-merge: git-tag
git-branch-merge: git-branch-merge:
echo $(GIT_DST_BRANCH)
current=$$(git rev-parse --abbrev-ref HEAD) \ current=$$(git rev-parse --abbrev-ref HEAD) \
git checkout "$(GIT_DST_BRANCH)" \ git checkout "$(GIT_DST_BRANCH)" && \
git merge "$(GIT_SRC_BRANCH)" git merge "$(GIT_SRC_BRANCH)" && \
git checkout "$$current" git checkout "$$current"