summaryrefslogtreecommitdiff
path: root/git-branch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-17 07:12:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-17 07:32:47 (GMT)
commit01385e275828c1116ea9bfcf827f82f450ee8f5f (patch)
treeea3821fc6425fef1b2968398465b745d251083c1 /git-branch.sh
parent69224716f78d6a772318e73060a70ba5ae67e55b (diff)
downloadgit-01385e275828c1116ea9bfcf827f82f450ee8f5f.zip
git-01385e275828c1116ea9bfcf827f82f450ee8f5f.tar.gz
git-01385e275828c1116ea9bfcf827f82f450ee8f5f.tar.bz2
Comment fixes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-branch.sh')
-rwxr-xr-xgit-branch.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-branch.sh b/git-branch.sh
index 0266f462..b0e54ed 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