diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:09:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:09:08 -0700 |
| commit | df873f96c8132c30d0cbd2b62b726d42d54dc58a (patch) | |
| tree | 71c49410b0e5fedab7b010d6e89f29c2c69645fc /git-rebase.sh | |
| parent | 79531569397d88336c147e620fddb1cbf9612d49 (diff) | |
| parent | 53f2ffa80c1c5ea5feb9fbe7432bf7106cf3047e (diff) | |
| download | git-df873f96c8132c30d0cbd2b62b726d42d54dc58a.tar.gz git-df873f96c8132c30d0cbd2b62b726d42d54dc58a.tar.xz | |
Merge branch 'jk/rebase-head-reflog'
* jk/rebase-head-reflog:
rebase: write a reflog entry when finishing
rebase: create HEAD reflog entry when aborting
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 7a54bfc61..d7855ea1c 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -153,7 +153,9 @@ move_to_original_branch () { message="rebase finished: $head_name onto $onto" git update-ref -m "$message" \ $head_name $(git rev-parse HEAD) $orig_head && - git symbolic-ref HEAD $head_name || + git symbolic-ref \ + -m "rebase finished: returning to $head_name" \ + HEAD $head_name || die "Could not move back to $head_name" ;; esac @@ -332,7 +334,7 @@ abort) read_basic_state case "$head_name" in refs/*) - git symbolic-ref HEAD $head_name || + git symbolic-ref -m "rebase: aborting" HEAD $head_name || die "Could not move back to $head_name" ;; esac |