summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-16 23:12:33 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-16 23:32:47 -0800
commit01385e275828c1116ea9bfcf827f82f450ee8f5f (patch)
treeea3821fc6425fef1b2968398465b745d251083c1
parentFix git-am --skip (diff)
downloadtgif-01385e275828c1116ea9bfcf827f82f450ee8f5f.tar.xz
Comment fixes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-branch.sh4
-rwxr-xr-xgit-checkout.sh2
2 files changed, 3 insertions, 3 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
diff --git a/git-checkout.sh b/git-checkout.sh
index f241d4ba6b..36308d22c6 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -116,7 +116,7 @@ else
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)