git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2025-12-13 00:06:03 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint

Browse Source 
* uk/maint-1.5.3-rebase-i-reflog:
  rebase--interactive: remote stray closing parenthesis

Conflicts:
	git-rebase--interactive.sh
This commit is contained in:
Junio C Hamano 2009-06-11 14:14:00 -07:00
commit a0c0447b8e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -420,7 +420,7 @@ do_next () {
NEWHEAD=$(git rev-parse HEAD) && NEWHEAD=$(git rev-parse HEAD) &&
case $HEADNAME in case $HEADNAME in
refs/*) refs/*)
message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" && message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO" &&
git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD && git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
git symbolic-ref HEAD $HEADNAME git symbolic-ref HEAD $HEADNAME
;; ;;