[PATCH] git pull manpage: don't include -n from fetch-options.txt
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 25, 2008, 10:17 UTC
- Message-ID
- <alpine.LSU.1.00.0801251016170.5731@racer.site>
- In-Reply-To
- <20080125092839.GF4475@genesis.frugalware.org>
From: Miklos Vajna <vmiklos@frugalware.org>
The -n option stands for --no-summary in git pull
[jes: reworded the description to avoid mentioning 'git-fetch'; also exclude '-n' conditional on git-pull -- ugly because of the missing "else" statement in asciidoc]
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> ---
On Fri, 25 Jan 2008, Miklos Vajna wrote:
> On Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano > <gitster@pobox.com> wrote: > > > > The -n option stands for --no-summary in git pull > > > > Ok, but does that mean --no-tags does not exist there? > > Oops, my bad. Here is an updated patch to just remove '-n' and > keep '--no-tags'.
How about this instead?
Documentation/fetch-options.txt | 12 ++++++++---- Documentation/git-pull.txt | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 61e48cc..b675911 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -23,11 +23,15 @@ fetches is a descendant of `<lbranch>`. This option overrides that check. +ifdef::git-pull[] +\--no-tags:: +endif::git-pull[] +ifndef::git-pull[] -n, \--no-tags:: - By default, `git-fetch` fetches tags that point at - objects that are downloaded from the remote repository - and stores them locally. This option disables this - automatic tag following. +endif::git-pull[] + By default, tags that point at objects that are downloaded + from the remote repository are fetched and stored locally. + This option disables this automatic tag following. -t, \--tags:: Most of the tags are fetched automatically as branch diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 77fdaf1..f9f1e0d 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -25,6 +25,7 @@ OPTIONS ------- include::merge-options.txt[] +:git-pull: 1 include::fetch-options.txt[] include::pull-fetch-param.txt[]
-- 1.5.4.rc4.36.g6e122