forked from ungleich-public/cdist
++ &&
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
parent
fc9dd61fe0
commit
ce27012d62
1 changed files with 2 additions and 3 deletions
5
Makefile
5
Makefile
|
@ -189,10 +189,9 @@ $(GIT_TAG_FILE):
|
|||
|
||||
#git-branch-merge: git-tag
|
||||
git-branch-merge:
|
||||
echo $(GIT_DST_BRANCH)
|
||||
current=$$(git rev-parse --abbrev-ref HEAD) \
|
||||
git checkout "$(GIT_DST_BRANCH)" \
|
||||
git merge "$(GIT_SRC_BRANCH)"
|
||||
git checkout "$(GIT_DST_BRANCH)" && \
|
||||
git merge "$(GIT_SRC_BRANCH)" && \
|
||||
git checkout "$$current"
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue