From b1e87d4da0378e378c9838190b7fec23273eb412 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 5 Jul 2010 11:29:25 +0200 Subject: [PATCH] rebasing-merge: in case of an error, write out a finish script We would like to finish the rebasing merge with a useful and consistent commit message, so let's just write out that command as shell script which can be run after resolving all the conflicts. Signed-off-by: Johannes Schindelin --- share/msysGit/rebasing-merge.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/msysGit/rebasing-merge.sh b/share/msysGit/rebasing-merge.sh index 553c9471..086029de 100755 --- a/share/msysGit/rebasing-merge.sh +++ b/share/msysGit/rebasing-merge.sh @@ -58,9 +58,14 @@ EOF git merge -s ours -m "Rebasing merge to $TO ($TO_SHA1)" \ $ORIG_HEAD else + FINISH="$(git rev-parse --git-dir)/finish-rebasing-merge.sh" + cat > "$FINISH" << EOF +git merge -s ours -m "Rebasing merge to $TO ($TO_SHA1)" $ORIG_HEAD +EOF + chmod a+x "$FINISH" cat << EOF -After the rebase, call 'git merge -s ours $ORIG_HEAD' manually +After the rebase, call '$FINISH' manually EOF fi -- 2.11.4.GIT