Andrew's git / gitweb.git / diff
?
Merge branch 'rt/rebase-p-no-merge-summary' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:45 +0000 (15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:45 +0000 (15:45 -0700)
* rt/rebase-p-no-merge-summary:
rebase --preserve-merges: ignore "merge.log" config

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history
diff --cc git-rebase--interactive.sh
Simple merge