Merge branch 'jc/maint-pull-docfix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:44:00 +0000 (10:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jan 2014 18:44:00 +0000 (10:44 -0800)
commit6d73dba...f6ace2a6b794b75f4fc71bb8ab09eba2
treec3b55c2...461e1463bdd182533715bffb9e14c976copy hash to clipboard (tree)
parentba98a2f...604fd2f9107ca9aec7d9b25e10a9ad60copy hash to clipboard (diff)
parent08f19cf...9bff097e8828a289d2daf5f066e1af9dcopy hash to clipboard (diff)
Documentation/git-pull.txt
Documentation/merge-options.txt