Merge branch 'jc/maint-pull-docfix'
commit6d73dba8f6ace2a6b794b75f4fc71bb8ab09eba2
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:44:00 +0000 (27 10:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:44:00 +0000 (27 10:44 -0800)
treec3b55c2b461e1463bdd182533715bffb9e14c976
parentba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60
parent08f19cfe9bff097e8828a289d2daf5f066e1af9d
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"
Documentation/git-pull.txt
Documentation/merge-options.txt