| commit | 8c731e9c8f92b138c31a0897321a2578ba9221e5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Sep 2013 22:00:56 +0000 (11 15:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Sep 2013 22:00:56 +0000 (11 15:00 -0700) | ||
| tree | 5bfc849cc4fc3e8c2e93da64ecf627defc005a06 | treesnapshot (tar.gz zip) |
| parent | 04e3274d6a3dd79be0649d5c13fb0b24edefdbda | commitdiff |
| parent | a9f739c111898ed879bc077fb3a2f71b9766bba7 | commitdiff |
Merge branch 'rt/rebase-p-no-merge-summary'
"git rebase -p" internally used the merge machinery, but when
rebasing, there should not be a need for merge summary.
* rt/rebase-p-no-merge-summary:
rebase --preserve-merges: ignore "merge.log" config
"git rebase -p" internally used the merge machinery, but when
rebasing, there should not be a need for merge summary.
* rt/rebase-p-no-merge-summary:
rebase --preserve-merges: ignore "merge.log" config
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |