mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 13:26:12 +02:00
Code

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

* 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
echo "First, rewinding head to replay your work on top of it..."
git checkout "$onto^0" >/dev/null 2>&1 ||
die "could not detach HEAD"
git checkout -q "$onto^0" || die "could not detach HEAD"
git update-ref ORIG_HEAD $branch
# If the $onto is a proper descendant of the tip of the branch, then