From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Nov 2010 19:00:24 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~150
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d6b634fafdb5570d9c25d5176d3d32fe0b22530d;p=git.git

Merge branch 'maint'

* maint:
  rebase -X: do not clobber strategy
---

d6b634fafdb5570d9c25d5176d3d32fe0b22530d