提交 5324a633 编写于 作者: J Junio C Hamano

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

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

Conflicts:
	git-rebase.sh
...@@ -376,8 +376,7 @@ fi ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册