mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Documentation/git-pull.txt: Add subtitles above included option files
Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6b276e19fa
commit
3f7a9b5ad1
|
@ -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[]
|
||||
|
|
Loading…
Reference in a new issue