Merge branch 'bc/fix-rebase-merge-skip' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:16:16 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:16:16 +0000 (11:16 -0700)
commit64630d8...7ae0a9717ae39c87bd1458bf15c62142
treeab4955b...e70e14600028aa4f7fd0d99f5579452acopy hash to clipboard (tree)
parent9092a96...6bee9a5729b7b1741a5de99aecb75552copy hash to clipboard (diff)
parent95104c7...257652b82aed089494def344e3938928copy hash to clipboard (diff)
git-rebase--merge.sh