From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 06:48:21 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.3.3~10^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4258c212ca2c3674be4b7e00a19db705eee77a48;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  git-show-ref.txt: remove word and make consistent
  git-svn documentation: fix typo in 'rebase vs. pull/merge' section
  use xstrdup, not strdup in ll-merge.c
---

4258c212ca2c3674be4b7e00a19db705eee77a48