summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-11 15:00:56 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-11 15:00:56 -0700
commit8c731e9c8f92b138c31a0897321a2578ba9221e5 (patch)
tree5bfc849cc4fc3e8c2e93da64ecf627defc005a06 /t/t3404-rebase-interactive.sh
parent04e3274d6a3dd79be0649d5c13fb0b24edefdbda (diff)
parenta9f739c111898ed879bc077fb3a2f71b9766bba7 (diff)
downloadgit-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 't/t3404-rebase-interactive.sh')
0 files changed, 0 insertions, 0 deletions