diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-14 10:26:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-14 10:46:17 -0800 |
| commit | d51a47552a913dcd4ba436d529d092e4f38a3182 (patch) | |
| tree | 69681d4f21625d17dee39f699598d3ca9b82b275 /Documentation | |
| parent | Documentation/git-pull: put verbosity options before merge/fetch ones (diff) | |
| download | tgif-d51a47552a913dcd4ba436d529d092e4f38a3182.tar.xz | |
Documentation: exclude irrelevant options from "git pull"
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index d47f9ddd89..0e7a1fe8ae 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 |