development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 21:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/rebase-checkout-not-so-quiet'

Browse source 
* rs/rebase-checkout-not-so-quiet:
  git-rebase: report checkout failure

Conflicts:
	git-rebase.sh
This commit is contained in:
Junio C Hamano 2008-07-16 17:12:09 -07:00
parent 7ed3fed33d 324c2c3177
commit 5324a6339a
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
git-rebase.sh
View file

@ -376,8 +376,7 @@ fi
# Detach HEAD and reset the tree # Detach HEAD and reset the tree
echo "First, rewinding head to replay your work on top of it..." echo "First, rewinding head to replay your work on top of it..."
git checkout "$onto^0" >/dev/null 2>&1 || git checkout -q "$onto^0" || die "could not detach HEAD"
die "could not detach HEAD"
git update-ref ORIG_HEAD $branch git update-ref ORIG_HEAD $branch
# If the $onto is a proper descendant of the tip of the branch, then # If the $onto is a proper descendant of the tip of the branch, then