From ce27012d623bef939e84ebf881e0a6a37de9c671 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 9 Jul 2013 17:24:22 +0200 Subject: [PATCH] ++ && Signed-off-by: Nico Schottelius --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b0b57903..c10b92bb 100644 --- a/Makefile +++ b/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"