Fix a typo in checkout.sh and cleanup one-line help messages

This also shortens option descriptions to fit in 80 columns.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-checkout.sh b/git-checkout.sh
index f6d58ac044e5afb09855d687d3c1bcc8e2273be3..5621c69d86062c7c75c0b8c2749d34efc78cafb4 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -2,13 +2,13 @@
 
 OPTIONS_KEEPDASHDASH=t
 OPTIONS_SPEC="\
 
 OPTIONS_KEEPDASHDASH=t
 OPTIONS_SPEC="\

-git-branch [options] [<branch>] [<paths>...]
+git-checkout [options] [<branch>] [<paths>...]

 --
 b=          create a new branch started at <branch>
 --
 b=          create a new branch started at <branch>

-l           create the new branchs reflog
-track       tells if the new branch should track the remote branch
+l           create the new branch's reflog
+track       arrange that the new branch tracks the remote branch

 f           proceed even if the index or working tree is not HEAD
 f           proceed even if the index or working tree is not HEAD

-m           performa  three-way merge on local modifications if needed
+m           merge local modifications into the new branch

 q,quiet     be quiet
 "
 SUBDIRECTORY_OK=Sometimes
 q,quiet     be quiet
 "
 SUBDIRECTORY_OK=Sometimes