summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 18:44:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-27 18:44:00 (GMT)
commit6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2 (patch)
treec3b55c2b461e1463bdd182533715bffb9e14c976 /Documentation/merge-options.txt
parentba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60 (diff)
parent08f19cfe9bff097e8828a289d2daf5f066e1af9d (diff)
downloadgit-6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2.zip
git-6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2.tar.gz
git-6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2.tar.bz2
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/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index afba8d4..e134315 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