diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-25 16:16:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-25 16:16:34 -0700 |
| commit | 0cb25d17445f848df13b971cb866c63c8f273b01 (patch) | |
| tree | 8728c224707f6b5c83d3fe8ccf1edbce7a1b91d4 /Documentation/git-pull.txt | |
| parent | a7f0fcb335cdd01a01e22fe80bc66c3eee2d9f38 (diff) | |
| parent | 67471bc704434412b367b570ad330330354598ed (diff) | |
| download | git-0cb25d17445f848df13b971cb866c63c8f273b01.tar.xz | |
Merge branch 'ja/doc-formatting-fix'
Documentation mark-up fix.
* ja/doc-formatting-fix:
doc: fix some placeholders formating
doc: format alternatives in synopsis
Diffstat (limited to 'Documentation/git-pull.txt')
| -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 0e14f8b5b2..b2ae496e48 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -87,7 +87,7 @@ OPTIONS --verbose:: Pass --verbose to git-fetch and git-merge. ---[no-]recurse-submodules[=yes|on-demand|no]:: +--[no-]recurse-submodules[=(yes|on-demand|no)]:: This option controls if new commits of populated submodules should be fetched, and if the working trees of active submodules should be updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and @@ -105,7 +105,7 @@ Options related to merging include::merge-options.txt[] -r:: ---rebase[=false|true|merges|interactive]:: +--rebase[=(false|true|merges|interactive)]:: When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch |