diff options
author | Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-12-21 00:01:00 -0800 |
commit | c2f3bf071ee90b01f2d629921bb04c4f798f02fa (patch) | |
tree | 08ffe5b40e062d596deee47f3869278f4661a858 /git-branch.sh | |
parent | 1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0 (diff) | |
parent | 41f93a2c903a45167b26c2dc93d45ffa9a9bbd49 (diff) |
GIT 1.0.0v1.0.0
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-branch.sh')
-rwxr-xr-x | git-branch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-branch.sh b/git-branch.sh index 0266f46223..b0e54ed2af 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 |