From: Junio C Hamano Date: Sat, 17 Dec 2005 07:12:33 +0000 (-0800) Subject: Comment fixes. X-Git-Tag: v1.0.0^2~27 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=01385e275828c1116ea9bfcf827f82f450ee8f5f;p=git.git Comment fixes. Signed-off-by: Junio C Hamano --- diff --git a/git-branch.sh b/git-branch.sh index 0266f462..b0e54ed2 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 f241d4ba..36308d22 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)