From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Mar 2009 04:45:02 +0000 (-0700)
Subject: Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1
X-Git-Tag: v1.6.2.1~1^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=54e7e7891b75741ba745e783dd5c5f488f377438;p=git.git

Merge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1

* js/maint-1.6.1-rebase-i-submodule:
  Fix submodule squashing into unrelated commit
  rebase -i squashes submodule changes into unrelated commit
---

54e7e7891b75741ba745e783dd5c5f488f377438