Merge branch 'jc/maint-pull-docfix' into maint
commit01a5774571d9dcc545d81d5f6d9781df9591c4cf
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Feb 2014 22:03:47 +0000 (5 14:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Feb 2014 22:03:47 +0000 (5 14:03 -0800)
treed8b3b9dbb429194ac38e90c76424d4cbbbe60460
parenta74a682b55848007909fb210de45aa7b8260a49a
parent08f19cfe9bff097e8828a289d2daf5f066e1af9d
Merge branch 'jc/maint-pull-docfix' into maint

The documentation to "git pull" hinted there is an "-m" option
because it incorrectly shared the documentation with "git merge".

* jc/maint-pull-docfix:
  Documentation: "git pull" does not have the "-m" option
  Documentation: exclude irrelevant options from "git pull"
Documentation/git-pull.txt
Documentation/merge-options.txt