Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint
author
Junio C Hamano
<gitster@pobox.com>
Thu, 11 Jun 2009 21:14:00 +0000
(14:14 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 11 Jun 2009 21:14:00 +0000
(14:14 -0700)
* uk/maint-1.5.3-rebase-i-reflog:
rebase--interactive: remote stray closing parenthesis
Conflicts:
git-rebase--interactive.sh
git-rebase--interactive.sh
patch
|
blob
|
history
raw
(from parent 1:
802f9c9
)
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index 314cd364b8f4df5e170dd0ffd9e874b3e6c2737c..f96d887d23653019e3387eced2779d50b3f09fa2 100755
(executable)
--- 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
;;