Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx>
---
Documentation/git-pull.txt | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
Nanako Shiraishi <nanako3@xxxxxxxxxxx> writes:
> Quoting Junio C Hamano <gitster@xxxxxxxxx>
>
>> Ah, in your defense ;-) I think you looked only at git-fetch.txt without
>> checking where else this file is included. Then the patch certainly is
>> understandable. It would probably make git-fetch.{1,html} easier to scan,
>> while making things not worse for git-pull.{1,html}
>
> Can't we introduce subsections in the OPTIONS section to
> group them together, like this (sorry, not a patch)?
>
> OPTIONS
> -------
>
> Options related to merging <---- added
> ~~~~~~~~~~~~~~~~~~~~~~~~~~ <---- added
> include::merge-options.txt[]
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 7578623..51534dd 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -26,6 +26,10 @@ Also note that options meant for 'git-pull' itself and underlying
OPTIONS
-------
+
+Options related to merging
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
include::merge-options.txt[]
:git-pull: 1
@@ -47,6 +51,9 @@ unless you have read linkgit:git-rebase[1] carefully.
--no-rebase::
Override earlier --rebase.
+Options related to fetching
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
include::fetch-options.txt[]
include::pull-fetch-param.txt[]
--
1.6.4.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html