summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6922471)
raw | patch | inline | side by side (parent: 6922471)
author | Junio C Hamano <junkio@cox.net> | |
Sat, 17 Dec 2005 07:12:33 +0000 (23:12 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 17 Dec 2005 07:32:47 +0000 (23:32 -0800) |
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-branch.sh | patch | blob | history | |
git-checkout.sh | patch | blob | history |
diff --git a/git-branch.sh b/git-branch.sh
index 0266f46223c2f20973bbbcb78f4825ff880d9bd3..b0e54ed2af9dbf06e79b7230a62029ee2ee8a269 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
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
diff --git a/git-checkout.sh b/git-checkout.sh
index f241d4ba6ba5a988f801e3307022d188204ff572..36308d22c6a72b9ad53ced60bd3c70a2e17520b6 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
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
# old MERGE_HEAD's (subsequent commits will clearly not
# be based on them, since we re-set the index)