"rebase -i": support special-purpose editor to edit insn sheet

diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 263987c55db053b3cb5455704b5206f272599fb8..c815a2412c2f33556ad712d328eaa80241c07bda 100644 (file)
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -7,12 +7,12 @@
 
 case "$action" in
 continue)
-       git am --resolved --3way --resolvemsg="$resolvemsg" &&
+       git am --resolved --resolvemsg="$resolvemsg" &&
        move_to_original_branch
        exit
        ;;
 skip)
-       git am --skip -3 --resolvemsg="$resolvemsg" &&
+       git am --skip --resolvemsg="$resolvemsg" &&
        move_to_original_branch
        exit
        ;;
@@ -26,9 +26,5 @@ git format-patch -k --stdout --full-index --ignore-if-in-upstream \
 git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" &&
 move_to_original_branch
 ret=$?
-test 0 != $ret -a -d "$state_dir" &&
-       echo $head_name > "$state_dir/head-name" &&
-       echo $onto > "$state_dir/onto" &&
-       echo $orig_head > "$state_dir/orig-head" &&
-       echo "$GIT_QUIET" > "$state_dir/quiet"
+test 0 != $ret -a -d "$state_dir" && write_basic_state
 exit $ret