From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 06:50:17 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~42
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c5764c095c2a563b657c1bd8f4a3e47bdeee14b0;p=git.git

Merge branch 'maint'

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

c5764c095c2a563b657c1bd8f4a3e47bdeee14b0