From: Johannes Sixt Date: Tue, 11 Dec 2007 16:36:32 GMT Subject: [PATCH] Fix a typo in checkout.sh and cleanup one-line help messages Message-ID: <475EBC90.1060606@viscovery.net> In-Reply-To: <20071211161305.GH15448@artemis.madism.org> This also shortens option descriptions to fit in 80 columns. Signed-off-by: Johannes Sixt --- Pierre Habouzit schrieb: > Signed-off-by: Pierre Habouzit > --- > > Woops there was another typo in the usage, fix it at the same time. > > git-checkout.sh | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) Funny, I had this in my tree since a few days, although embarassingly, I hadn't spotted the "git-branch" typo :-/ -- Hannes git-checkout.sh | 8 ++++---- 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] [] [...] +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 -- 1.5.3.7.1079.gecca