From: Johannes Sixt <j.sixt@viscovery.net>
Date: Tue, 11 Dec 2007 16:36:32 +0000 (+0100)
Subject: Fix a typo in checkout.sh and cleanup one-line help messages
X-Git-Tag: v1.5.4-rc0~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=550f8fd01bd57814b7ac8a7fed1709a50d6c6d90;p=git.git

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 f6d58ac04..5621c69d8 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -2,13 +2,13 @@
 
 OPTIONS_KEEPDASHDASH=t
 OPTIONS_SPEC="\
-git-branch [options] [<branch>] [<paths>...]
+git-checkout [options] [<branch>] [<paths>...]
 --
 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
-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