diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:44:00 -0800 |
| commit | 6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2 (patch) | |
| tree | c3b55c2b461e1463bdd182533715bffb9e14c976 /Documentation | |
| parent | Merge branch 'jk/complete-merge-base' (diff) | |
| parent | Documentation: "git pull" does not have the "-m" option (diff) | |
| download | tgif-6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2.tar.xz | |
Merge branch 'jc/maint-pull-docfix'
* jc/maint-pull-docfix:
Documentation: "git pull" does not have the "-m" option
Documentation: exclude irrelevant options from "git pull"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 4 | ||||
| -rw-r--r-- | Documentation/merge-options.txt | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 6083aab87b..200eb22260 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -99,10 +99,10 @@ must be given before the options meant for 'git fetch'. Options related to merging ~~~~~~~~~~~~~~~~~~~~~~~~~~ -include::merge-options.txt[] - :git-pull: 1 +include::merge-options.txt[] + -r:: --rebase[=false|true|preserve]:: When true, rebase the current branch on top of the upstream diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index afba8d4f3b..e1343155fa 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -14,9 +14,12 @@ inspect and further tweak the merge result before committing. further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally - discouraged). The `--edit` (or `-e`) option is still useful if you are - giving a draft message with the `-m` option from the command line - and want to edit it in the editor. + discouraged). +ifndef::git-pull[] +The `--edit` (or `-e`) option is still useful if you are +giving a draft message with the `-m` option from the command line +and want to edit it in the editor. +endif::git-pull[] + Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when |