Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-12-16 23:12:33 -08:00
Родитель 69224716f7
Коммит 01385e2758
2 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -32,11 +32,11 @@ delete_branch () {
case " $mbs " in case " $mbs " in
*' '$branch' '*) *' '$branch' '*)
# the merge base of branch and HEAD contains branch -- # the merge base of branch and HEAD contains branch --
# which means that the HEAD contains everything in the HEAD. # which means that the HEAD contains everything in both.
;; ;;
*) *)
echo >&2 "The branch '$branch_name' is not a strict subset of your current HEAD. echo >&2 "The branch '$branch_name' is not a strict subset of your current HEAD.
If you are sure you want to delete it, run 'git branch -D $branch_name'." If you are sure you want to delete it, run 'git branch -D $branch_name'."
exit 1 exit 1
;; ;;
esac esac

Просмотреть файл

@ -116,7 +116,7 @@ else
fi fi
# #
# Switch the HEAD pointer to the new branch if it we # Switch the HEAD pointer to the new branch if we
# checked out a branch head, and remove any potential # checked out a branch head, and remove any potential
# old MERGE_HEAD's (subsequent commits will clearly not # old MERGE_HEAD's (subsequent commits will clearly not
# be based on them, since we re-set the index) # be based on them, since we re-set the index)