Thomas Braun <[email protected]> writes:
>> * rh/mergetool-regression-fix (2017-01-10) 14 commits
>> (merged to 'next' on 2017-01-10 at e8e00c798b)
>> + mergetool: fix running in subdir when rerere enabled
>> + mergetool: take the "-O" out of $orderfile
>> + t7610: add test case for rerere+mergetool+subdir bug
>> + t7610: spell 'git reset --hard' consistently
>> + t7610: don't assume the checked-out commit
>> + t7610: always work on a test-specific branch
>> + t7610: delete some now-unnecessary 'git reset --hard' lines
>> + t7610: run 'git reset --hard' after each test to clean up
>> + t7610: don't rely on state from previous test
>> + t7610: use test_when_finished for cleanup tasks
>> + t7610: move setup code to the 'setup' test case
>> + t7610: update branch names to match test number
>> + rev-parse doc: pass "--" to rev-parse in the --prefix example
>> + .mailmap: record canonical email for Richard Hansen
> ...
> Sorry for asking a maybe obvious question.
> Will that be merged into maint as well?
A good way to tell is to compare outputs from these two:
$ git log --first-parent maint..$tip_of_the_topic
$ git log --first-parent master..$tip_of_the_topic
I actually wasn't planning to. We (or distro packagers) may want to
cherry-pick the essential bits from the topic and backport to 'maint'.
