diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-18 12:48:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-18 12:48:20 -0700 |
| commit | afbfcaa98396de66e42dc3c845f396c5ba508ced (patch) | |
| tree | 7c3e806f0f1bbfeb8a02971daf04c68c51f4840c /git-rebase--interactive.sh | |
| parent | 001b0976afe6f41bff46aa3eaad0285b641a50ea (diff) | |
| parent | 26cd160cb15635afd1c2937a3c15cfb256758323 (diff) | |
| download | git-afbfcaa98396de66e42dc3c845f396c5ba508ced.tar.gz | |
Merge branch 'rr/rebase-reflog-message-reword'
"git rebase [-i]" used to leave just "rebase" as its reflog message
for some operations. This rewords them to be more informative.
* rr/rebase-reflog-message-reword:
rebase -i: use a better reflog message
rebase: use a better reflog message
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 157690b685..83d6d4676b 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -864,8 +864,11 @@ comment_for_reflog start if test ! -z "$switch_to" then + GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" output git checkout "$switch_to" -- || - die "Could not checkout $switch_to" + die "Could not checkout $switch_to" + + comment_for_reflog start fi orig_head=$(git rev-parse --verify HEAD) || die "No HEAD?" @@ -1007,6 +1010,7 @@ has_action "$todo" || test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks +GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" output git checkout $onto || die_abort "could not detach HEAD" git update-ref ORIG_HEAD $orig_head do_rest |