All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Sebastian Celis <sebastian@sebastiancelis.com>,
	Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org
Subject: [PATCH v2 1/6] Fix 'git var' usage synopsis
Date: Sun, 14 Feb 2010 20:36:36 -0600	[thread overview]
Message-ID: <20100215023636.GA17444@progeny.tock> (raw)
In-Reply-To: <20100214115533.GA3499@progeny.tock>

Jonathan Nieder wrote:

> --- a/builtin-var.c
> +++ b/builtin-var.c
> @@ -6,7 +6,7 @@
>  #include "cache.h"
>  #include "exec_cmd.h"
>  
> -static const char var_usage[] = "git var [-l | <variable>]";
> +static const char var_usage[] = "git var (-l | <variable>)";
>  static const char *editor(int flag)
>  {

As Junio noticed, this doesn’t apply.  The problem is a missing
blank line between the static const char var_usage and static const
char *editor lines.  Worse still, I have no clue how it happened.

Here’s a revised patch (generated just like the first one...).  It
is really an independent fix from the rest of the series.

-- %< --
Subject: Fix 'git var' usage synopsis

The parameter to 'git var' is not optional.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 Documentation/git-var.txt |    2 +-
 builtin-var.c             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index bb98182..458f3e2 100644
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -8,7 +8,7 @@ git-var - Show a git logical variable
 
 SYNOPSIS
 --------
-'git var' [ -l | <variable> ]
+'git var' ( -l | <variable> )
 
 DESCRIPTION
 -----------
diff --git a/builtin-var.c b/builtin-var.c
index 2280518..e6ee7bc 100644
--- a/builtin-var.c
+++ b/builtin-var.c
@@ -6,7 +6,7 @@
 #include "cache.h"
 #include "exec_cmd.h"
 
-static const char var_usage[] = "git var [-l | <variable>]";
+static const char var_usage[] = "git var (-l | <variable>)";
 
 static const char *editor(int flag)
 {
-- 
1.7.0

  parent reply	other threads:[~2010-02-15  2:36 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-13 21:14 'git svn log' no longer uses the pager Sebastian Celis
2010-02-13 23:51 ` Jeff King
2010-02-14 11:54   ` Jonathan Nieder
2010-02-14 11:55     ` [PATCH 1/6] Fix 'git var' usage synopsis Jonathan Nieder
2010-02-15  2:22       ` Junio C Hamano
2010-02-15  2:36       ` Jonathan Nieder [this message]
2010-02-15  4:47         ` [PATCH v2 " Jeff King
2010-02-14 11:59     ` [PATCH 2/6] Make 'git var GIT_PAGER' always print the configured pager Jonathan Nieder
2010-02-15  5:00       ` Jeff King
2010-02-15  5:44         ` Jonathan Nieder
2010-02-15  7:57           ` Jeff King
2010-02-14 12:02     ` [PATCH 3/6] git.1: Clarify the behavior of the --paginate option Jonathan Nieder
2010-02-15  4:55       ` Jeff King
2010-02-14 12:06     ` [PATCH 4/6] git svn: Fix launching of pager Jonathan Nieder
2010-02-15  7:58       ` Eric Wong
2010-02-14 12:07     ` [PATCH 5/6] am: " Jonathan Nieder
2010-02-15  2:30       ` Junio C Hamano
2010-02-15  2:59       ` [PATCH v2 " Jonathan Nieder
2010-02-15  3:25         ` [PATCH v3 " Jonathan Nieder
2010-02-15  4:42           ` Jeff King
2010-02-15  5:04             ` [PATCH v4 " Jonathan Nieder
2010-02-15  5:12               ` Jeff King
2010-02-15 20:26               ` Johannes Sixt
2010-02-14 12:13     ` [PATCH 6/6] tests: Add tests for automatic use " Jonathan Nieder
2010-02-15  5:10       ` Jeff King
2010-02-15  5:35         ` [PATCH v2 " Jonathan Nieder
2010-02-15  5:37           ` Jeff King

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=20100215023636.GA17444@progeny.tock \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=sebastian@sebastiancelis.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 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.