projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-recursive: conflicting rename case.
[git.git]
/
git-branch.sh
diff --git
a/git-branch.sh
b/git-branch.sh
index
0266f46
..
b0e54ed
100755
(executable)
--- 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 --
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.
;;
*)
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
exit 1
;;
esac