Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 08:54:46 +0000 (01:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 08:54:46 +0000 (01:54 -0700)
* maint:
  git-pull documentation: warn about the option order

1  2 
Documentation/git-pull.txt

Simple merge