summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorJohannes Sixt <j.sixt@viscovery.net>2007-12-11 16:36:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-11 17:52:44 (GMT)
commit550f8fd01bd57814b7ac8a7fed1709a50d6c6d90 (patch)
tree8b872b52b574cfad90928044d4979028e2e6baaf /git-checkout.sh
parentbf82a15095ed374496c2e98b6b672aa8c8c4d034 (diff)
downloadgit-550f8fd01bd57814b7ac8a7fed1709a50d6c6d90.zip
git-550f8fd01bd57814b7ac8a7fed1709a50d6c6d90.tar.gz
git-550f8fd01bd57814b7ac8a7fed1709a50d6c6d90.tar.bz2
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>
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index f6d58ac..5621c69 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