From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>, Andreas Krey <a.krey@gmx.de>
Subject: Re: [PATCH 2/3] move index_has_changes() from builtin/am.c to merge.c for reuse
Date: Fri, 22 Dec 2017 18:26:30 -0800 [thread overview]
Message-ID: <CABPp-BF4h3nBUhr-akw0SFy_RboRjf_gYXe-+ikgRhFNXf3C1Q@mail.gmail.com> (raw)
In-Reply-To: <xmqqd136qymc.fsf@gitster.mtv.corp.google.com>
On Fri, Dec 22, 2017 at 12:46 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Elijah Newren <newren@gmail.com> writes:
>
>> On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren <newren@gmail.com> wrote:
>>> index_has_changes() is a function we want to reuse outside of just am,
>>> making it also available for merge-recursive and merge-ort.
>>>
>>> Signed-off-by: Elijah Newren <newren@gmail.com>
>>> ---
>>
>> Note: These patches built on master, and merge cleanly with next and
>> pu. However, this patch has a minor conflict with maint. If you'd
>> prefer a version that applies on top of maint, let me know and I'll
>> resubmit.
>
> I think I managed to create two topics, one that is with these three
> patches (2/3 backported) on top of maint and the other one merges
> the former on top of master. Please see if you found a mismerge
> when I push the results out.
I'm about to head out on a multi-day trip, so I might not get to this
until the middle of next week. I'll try to take a look as soon as I
can, though.
next prev parent reply other threads:[~2017-12-23 2:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 11:43 git merge commits staged files (when two trees are identical) Andreas Krey
2017-12-21 18:50 ` Elijah Newren
2017-12-21 19:19 ` [PATCH 1/3] t6044: recursive can silently incorporate dirty changes in a merge Elijah Newren
2017-12-21 19:19 ` [PATCH 2/3] move index_has_changes() from builtin/am.c to merge.c for reuse Elijah Newren
2017-12-21 19:36 ` Elijah Newren
2017-12-22 20:46 ` Junio C Hamano
2017-12-23 2:26 ` Elijah Newren [this message]
2017-12-21 19:19 ` [PATCH 3/3] merge-recursive: Avoid incorporating uncommitted changes in a merge Elijah Newren
2017-12-22 20:38 ` Junio C Hamano
2018-01-08 20:37 ` Junio C Hamano
2018-01-09 18:19 ` [PATCH] merge-recursive: do not look at the index during recursive merge Junio C Hamano
2018-01-09 18:25 ` Junio C Hamano
2018-01-09 18:27 ` Eric Sunshine
2018-01-09 18:29 ` Elijah Newren
2018-01-09 18:49 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BF4h3nBUhr-akw0SFy_RboRjf_gYXe-+ikgRhFNXf3C1Q@mail.gmail.com \
--to=newren@gmail.com \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).