Merge branch 'maint'
commit1c536069780bc67c05e621f0485f787d04559f24
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 08:54:46 +0000 (11 01:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2008 08:54:46 +0000 (11 01:54 -0700)
tree671a0f4b114d7fec8644a5e07d09ab355a654f85
parent702088afc680afef231d4a24bb5890f1d96a2cc9
parent92aeb994d3195d3601df2e37052d60f9a6738b61
Merge branch 'maint'

* maint:
  git-pull documentation: warn about the option order
Documentation/git-pull.txt