Merge branch 'jk/rebase-i-submodule-conflict-only' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 04:11:26 +0000 (21:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2012 04:11:26 +0000 (21:11 -0700)
commita4da338...fd83e4b31273d71bebf8a92becd8f60c
tree1d86a52...90e732be24076f875203f82941e1e500copy hash to clipboard (tree)
parent520d2ce...1c5c48e75f1d8baac7cb6fe6f6e8b915copy hash to clipboard (diff)
parenta6754cd...4362d129738d42d2683d07d433379e99copy hash to clipboard (diff)