Skip to content

Commit

Permalink
rebase --merge: return control to caller, for housekeeping
Browse files Browse the repository at this point in the history
Return control to the caller git-rebase.sh to get these two tasks

    rm -fr "$dotest"
    git gc --auto

done by it.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ramkumar Ramachandra authored and Junio C Hamano committed May 13, 2013
1 parent 15d4bf2 commit 01a1e64
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions git-rebase--merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ finish_rb_merge () {
"$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
fi
fi
rm -r "$state_dir"
say All done.
}

Expand All @@ -110,7 +109,7 @@ continue)
continue_merge
done
finish_rb_merge
exit
return
;;
skip)
read_state
Expand All @@ -122,7 +121,7 @@ skip)
continue_merge
done
finish_rb_merge
exit
return
;;
esac

Expand Down

0 comments on commit 01a1e64

Please sign in to comment.