Merge branch 'jn/doc-pull' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:53:08 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:53:08 +0000 (12:53 -0700)
* jn/doc-pull:
Documentation: flesh out “git pull” description

Trivial merge