Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:45:21 +0000 (10:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:45:21 +0000 (10:45 -0700)
commite31b018...729cab2d6a8e2c76f009017355dacf06
treef76385f...c62c0bd508891c681594537f378fcf50copy hash to clipboard (tree)
parentbc67ad8...375ce8f31021411f088a968f12cb2675copy hash to clipboard (diff)
parentc192f9c...65dbdae48c0400d717581d34cd315fb8copy hash to clipboard (diff)