From 550f8fd01bd57814b7ac8a7fed1709a50d6c6d90 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Tue, 11 Dec 2007 17:36:32 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-checkout.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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] [] [...] +git-checkout [options] [] [...] -- b= create a new branch started at -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 -- 2.26.2