Merge branch 'jc/mention-tracking-for-pull-default' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:19 +0000 (08:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Feb 2013 16:04:20 +0000 (08:04 -0800)
* jc/mention-tracking-for-pull-default:
  doc: mention tracking for pull.default

1  2 
Documentation/config.txt

Simple merge