Merge branch 'dp/maint-rebase-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 02:53:25 +0000 (19:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 02:53:25 +0000 (19:53 -0700)
commitea2408b...e18b4f9d1eaa9d8587c5ae6196552cac
treea1794cb...bef2c8267ee365df5f78c51d5a61ce63copy hash to clipboard (tree)
parent2ba3d5d...bd47c42400049e81d0e1e94948112277copy hash to clipboard (diff)
parentc14c3c8...da9a46c65008060ad8e6dacef1a24ba9copy hash to clipboard (diff)