diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-11 15:00:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-11 15:00:56 -0700 |
| commit | 8c731e9c8f92b138c31a0897321a2578ba9221e5 (patch) | |
| tree | 5bfc849cc4fc3e8c2e93da64ecf627defc005a06 /check-racy.c | |
| parent | 04e3274d6a3dd79be0649d5c13fb0b24edefdbda (diff) | |
| parent | a9f739c111898ed879bc077fb3a2f71b9766bba7 (diff) | |
| download | git-8c731e9c8f92b138c31a0897321a2578ba9221e5.tar.gz | |
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
Diffstat (limited to 'check-racy.c')
0 files changed, 0 insertions, 0 deletions