[PATCH] git pull manpage: don't include -n from fetch-options.txt
From: Miklos Vajna <hidden>
Date: 2016-06-15 22:44:08
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] git pull manpage: don't include -n from fetch-options.txt · Miklos Vajna <hidden>
- 2016-06-15 · Re: [PATCH] git pull manpage: don't include -n from fetch-options.txt · Johannes Schindelin <hidden>
The -n option stands for --no-summary in git pull Signed-off-by: Miklos Vajna <redacted> --- On Thu, Jan 24, 2008 at 05:36:33PM -0800, Junio C Hamano [off-list ref] wrote:
quoted
The -n option stands for --no-summary in git pullOk, 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'. Documentation/fetch-options.txt | 5 +++++ Documentation/git-pull.txt | 1 + 2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 61e48cc..702f953 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt@@ -23,7 +23,12 @@ fetches is a descendant of `<lbranch>`. This option overrides that check. +ifndef::git-pull[] -n, \--no-tags:: +endif::git-pull[] +ifdef::git-pull[] +\--no-tags:: +endif::git-pull[] 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
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-dirty