git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH 01/16] git-sh-setup: make usage text consistent
Date: Sat, 23 Feb 2013 16:20:39 -0800	[thread overview]
Message-ID: <1361665254-42866-2-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1361665254-42866-1-git-send-email-davvid@gmail.com>

mergetool, bisect, and other commands that use
git-sh-setup print a usage string that is inconsistent
with the rest of Git when they are invoked as "git $cmd -h".

The compiled builtins use the lowercase "usage:" string
but these commands say "Usage:".  Adjust the shell library
to make these consistent.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 git-sh-setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 795edd2..9cfbe7f 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -84,14 +84,14 @@ if test -n "$OPTIONS_SPEC"; then
 else
 	dashless=$(basename "$0" | sed -e 's/-/ /')
 	usage() {
-		die "Usage: $dashless $USAGE"
+		die "usage: $dashless $USAGE"
 	}
 
 	if [ -z "$LONG_USAGE" ]
 	then
-		LONG_USAGE="Usage: $dashless $USAGE"
+		LONG_USAGE="usage: $dashless $USAGE"
 	else
-		LONG_USAGE="Usage: $dashless $USAGE
+		LONG_USAGE="usage: $dashless $USAGE
 
 $LONG_USAGE"
 	fi
-- 
1.8.2.rc0.247.g811e0c0

  reply	other threads:[~2013-02-24  0:21 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-24  0:20 [PATCH 00/16] make usage text consistent in git commands David Aguilar
2013-02-24  0:20 ` David Aguilar [this message]
2013-02-24  0:20   ` [PATCH 02/16] git-svn: make usage text consistent David Aguilar
2013-02-24  0:20     ` [PATCH 03/16] git-relink: " David Aguilar
2013-02-24  0:20       ` [PATCH 04/16] git-merge-one-file: " David Aguilar
2013-02-24  0:20         ` [PATCH 05/16] git-archimport: " David Aguilar
2013-02-24  0:20           ` [PATCH 06/16] git-cvsexportcommit: " David Aguilar
2013-02-24  0:20             ` [PATCH 07/16] git-cvsimport: " David Aguilar
2013-02-24  0:20               ` [PATCH 08/16] " David Aguilar
2013-02-24  0:20                 ` [PATCH 09/16] contrib/credential: " David Aguilar
2013-02-24  0:20                   ` [PATCH 10/16] contrib/fast-import: " David Aguilar
2013-02-24  0:20                     ` [PATCH 11/16] contrib/fast-import/import-zips.py: fix broken error message David Aguilar
2013-02-24  0:20                       ` [PATCH 12/16] contrib/fast-import/import-zips.py: use spaces instead of tabs David Aguilar
2013-02-24  0:20                         ` [PATCH 13/16] contrib/examples: make usage text consistent David Aguilar
2013-02-24  0:20                           ` [PATCH 14/16] contrib/hooks/setgitperms.perl: " David Aguilar
2013-02-24  0:20                             ` [PATCH 15/16] templates/hooks--update.sample: " David Aguilar
2013-02-24  0:20                               ` [PATCH 16/16] Documentation/user-manual.txt: " David Aguilar
2013-02-24  0:25   ` [PATCH 01/16] git-sh-setup: " Jonathan Nieder
2013-02-24  0:29 ` [PATCH 00/16] make usage text consistent in git commands Jonathan Nieder
2013-02-24  0:37   ` David Aguilar

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=1361665254-42866-2-git-send-email-davvid@gmail.com \
    --to=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).