Merge branch 'jc/maint-pull-docfix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Feb 2014 22:03:47 +0000 (14:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Feb 2014 22:03:47 +0000 (14:03 -0800)
commit01a5774...71d9dcc545d81d5f6d9781df9591c4cf
treed8b3b9d...b429194ac38e90c76424d4cbbbe60460copy hash to clipboard (tree)
parenta74a682...55848007909fb210de45aa7b8260a49acopy hash to clipboard (diff)
parent08f19cf...9bff097e8828a289d2daf5f066e1af9dcopy hash to clipboard (diff)
Documentation/git-pull.txt
Documentation/merge-options.txt