diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-11 14:14:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-11 14:14:00 -0700 |
| commit | a0c0447b8eda07529eec2ae8fbc6bf68e1ff2d67 (patch) | |
| tree | d44b88a9c5aadb106cfb822af26417146cb871d4 | |
| parent | 802f9c9cb21321d3ffe7576e01bbe31c51bd4c70 (diff) | |
| parent | 795cbe938fdc60228c4c9654a658aa27a7570b79 (diff) | |
| download | git-a0c0447b8eda07529eec2ae8fbc6bf68e1ff2d67.tar.gz git-a0c0447b8eda07529eec2ae8fbc6bf68e1ff2d67.tar.xz | |
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint
* uk/maint-1.5.3-rebase-i-reflog:
rebase--interactive: remote stray closing parenthesis
Conflicts:
git-rebase--interactive.sh
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 314cd364b..f96d887d2 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -420,7 +420,7 @@ do_next () { NEWHEAD=$(git rev-parse HEAD) && case $HEADNAME in refs/*) - message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" && + message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" && git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD && git symbolic-ref HEAD $HEADNAME ;; |