From: Junio C Hamano <gitster@pobox•com>
To: "Torsten Bögershausen" <tboegi@web•de>
Cc: Ivan Zakharyaschev <imz@altlinux•org>, git@vger•kernel.org
Subject: [PATCH 1/2] Documentation: exclude irrelevant options from "git pull"
Date: Tue, 14 Jan 2014 11:54:45 -0800 [thread overview]
Message-ID: <xmqqd2ju49b3.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: 7v61pm1hfe.fsf@alter.siamese.dyndns.org
10eb64f5 (git pull manpage: don't include -n from fetch-options.txt,
2008-01-25) introduced a way to exclude some parts of included
source when building git-pull documentation, and later 409b8d82
(Documentation/git-pull: put verbosity options before merge/fetch
ones, 2010-02-24) attempted to use the mechanism to exclude some
parts of merge-options.txt when used from git-pull.txt.
However, the latter did not have an intended effect, because the
macro "git-pull" used to decide if the source is included in
git-pull documentation were defined a bit too late.
Define the macro before it is used to fix this.
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
* To be applied on top of 409b8d82 (Documentation/git-pull: put
verbosity options before merge/fetch ones, 2010-02-24)
Documentation/git-pull.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index d47f9dd..0e7a1fe 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -42,10 +42,10 @@ OPTIONS
Options related to merging
~~~~~~~~~~~~~~~~~~~~~~~~~~
-include::merge-options.txt[]
-
:git-pull: 1
+include::merge-options.txt[]
+
--rebase::
Instead of a merge, perform a rebase after fetching. If
there is a remote ref for the upstream branch, and this branch
--
1.8.5.3-493-gb139ac2
next prev parent reply other threads:[~2014-01-14 20:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-14 2:09 BUG: manpage for git-pull mentions a non-valid option -m in a comment Ivan Zakharyaschev
2014-01-14 18:26 ` Re* " Junio C Hamano
2014-01-14 18:51 ` Torsten Bögershausen
2014-01-14 19:39 ` Junio C Hamano
2014-01-14 19:54 ` Junio C Hamano [this message]
2014-01-14 19:57 ` [PATCH 2/2] Documentation: "git pull" does not have the "-m" option 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=xmqqd2ju49b3.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=imz@altlinux$(echo .)org \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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