Merge branch 'maint'
authorJunio C Hamano <redacted>
Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800)
committerJunio C Hamano <redacted>
Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800)
* maint:
  rebase -X: do not clobber strategy


Trivial merge
git clone https://git.99rst.org/PROJECT