| commit | 9a3a02b605ae58f5d61e48f213cf11bef3379739 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Oct 2013 22:45:45 +0000 (17 15:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Oct 2013 22:45:45 +0000 (17 15:45 -0700) | ||
| tree | 2fa76b68458b835b031d2511049cfee3afa905cf | treesnapshot (tar.gz zip) |
| parent | 6f89c2714a557ad3630ed005f4680193a638ce3f | commitdiff |
| parent | a9f739c111898ed879bc077fb3a2f71b9766bba7 | commitdiff |
Merge branch 'rt/rebase-p-no-merge-summary' into maint
* rt/rebase-p-no-merge-summary:
rebase --preserve-merges: ignore "merge.log" config
* rt/rebase-p-no-merge-summary:
rebase --preserve-merges: ignore "merge.log" config
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |