X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-branch.sh;h=b0e54ed2af9dbf06e79b7230a62029ee2ee8a269;hb=78c2cff61f87d43c1f4ef5a03547f093c4c6e0c9;hp=0266f46223c2f20973bbbcb78f4825ff880d9bd3;hpb=1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0;p=git.git diff --git a/git-branch.sh b/git-branch.sh index 0266f4622..b0e54ed2a 100755 --- a/git-branch.sh +++ b/git-branch.sh @@ -32,11 +32,11 @@ delete_branch () { case " $mbs " in *' '$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. - 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 ;; esac