From: Junio C Hamano <gitster@pobox•com>
To: Thomas Braun <thomas.braun@virtuell-zuhause•de>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Jan 2017, #03; Thu, 19)
Date: Tue, 24 Jan 2017 13:59:01 -0800 [thread overview]
Message-ID: <xmqqh94oce6y.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1929244236.1844627.1485284187492.JavaMail.open-xchange@app04.ox.hosteurope.de> (Thomas Braun's message of "Tue, 24 Jan 2017 19:56:27 +0100 (CET)")
Thomas Braun <thomas.braun@virtuell-zuhause•de> 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'.
prev parent reply other threads:[~2017-01-24 21:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 23:37 What's cooking in git.git (Jan 2017, #03; Thu, 19) Junio C Hamano
2017-01-24 18:56 ` Thomas Braun
2017-01-24 21:59 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh94oce6y.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=thomas.braun@virtuell-zuhause$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox