Merge branch 'maint'
commitc5764c095c2a563b657c1bd8f4a3e47bdeee14b0
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:50:17 +0000 (20 23:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 06:50:17 +0000 (20 23:50 -0700)
tree2ea2c85a4fc13fbae8e6ad0bd6a8023f13d77f29
parent2af202be3d2f128c6974290cabe13179c6462196
parent3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f
Merge branch 'maint'

* maint:
  git-show-ref.txt: remove word and make consistent
  git-svn documentation: fix typo in 'rebase vs. pull/merge' section
Documentation/git-svn.txt