Merge branch 'jk/rebase-i-submodule-conflict-only'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Apr 2012 19:39:04 +0000 (12:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Apr 2012 19:39:05 +0000 (12:39 -0700)
commit1f64344...598c3727b506a46d88f734b13e90dc77
tree7dcbb73...e11b182209a398e56cf02469f7af7db1copy hash to clipboard (tree)
parentd1ca788...cd34962a65924843ef1d0c773d565030copy hash to clipboard (diff)
parenta6754cd...4362d129738d42d2683d07d433379e99copy hash to clipboard (diff)
git-rebase--interactive.sh