All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Pierre Habouzit <madcoder@debian.org>
Cc: Git ML <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] Fix a typo in checkout.sh and cleanup one-line help messages
Date: Tue, 11 Dec 2007 17:36:32 +0100	[thread overview]
Message-ID: <475EBC90.1060606@viscovery.net> (raw)
In-Reply-To: <20071211161305.GH15448@artemis.madism.org>

This also shortens option descriptions to fit in 80 columns.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
---
Pierre Habouzit schrieb:
> Signed-off-by: Pierre Habouzit <madcoder@debian.org>
> ---
> 
>   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] [<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
-- 
1.5.3.7.1079.gecca

  reply	other threads:[~2007-12-11 16:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-11 16:09 [PATCH] stupid typo in git-checkout.sh Pierre Habouzit
2007-12-11 16:13 ` [PATCH Resend] Stupid typos " Pierre Habouzit
2007-12-11 16:36   ` Johannes Sixt [this message]
2007-12-11 19:49     ` [PATCH] Fix a typo in checkout.sh and cleanup one-line help messages Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=475EBC90.1060606@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=madcoder@debian.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.