| commit | 08f19cfe9bff097e8828a289d2daf5f066e1af9d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Jan 2014 18:26:21 +0000 (14 10:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Jan 2014 18:47:36 +0000 (14 10:47 -0800) | ||
| tree | 06a82c4e281b49cc861b1888e52dd360a5ee025a | treesnapshot (tar.gz zip) |
| parent | 8be1d04a7e9251380a5de80564284f0099774038 | commitdiff |
Documentation: "git pull" does not have the "-m" option
Even though "--[no-]edit" can be used with "git pull", the
explanation of the interaction between this option and the "-m"
option does not make sense within the context of "git pull". Use
the conditional inclusion mechanism to remove this part from "git
pull" documentation, while keeping it for "git merge".
Reported-by: Ivan Zakharyaschev
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Even though "--[no-]edit" can be used with "git pull", the
explanation of the interaction between this option and the "-m"
option does not make sense within the context of "git pull". Use
the conditional inclusion mechanism to remove this part from "git
pull" documentation, while keeping it for "git merge".
Reported-by: Ivan Zakharyaschev
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-options.txt | diffblobblamehistory |