From: Junio C Hamano <gitster@pobox.com>
To: "D. Ben Knoble" <ben.knoble+github@gmail.com>
Cc: Fernando Ramos <greenfoo@u92.eu>,
git@vger.kernel.org, kawarimidoll <kawarimidoll+git@gmail.com>
Subject: Re: [PATCH 1/2] mergetools: vimdiff: fix layout where REMOTE is the target
Date: Sat, 29 Mar 2025 13:46:45 -0700 [thread overview]
Message-ID: <xmqqa593d0p6.fsf@gitster.g> (raw)
In-Reply-To: <CALnO6CC9M3nBoA-D7rLW_68VkKm9eZ_K7CZn1Z-BiPJWxgNYHQ@mail.gmail.com> (D. Ben Knoble's message of "Fri, 28 Mar 2025 20:23:37 -0400")
"D. Ben Knoble" <ben.knoble+github@gmail.com> writes:
>> ...
>> FINAL_TARGET="BASE"
>> + elif echo "$LAYOUT" | grep @REMOTE >/dev/null
>> + then
>> + FINAL_TARGET="REMOTE"
>> else
>> FINAL_TARGET="MERGED"
>> fi
>> --
>> 2.49.0
>>
>
> This looks pretty obviously correct to me, thanks!
Yeah, thanks, all. Will queue.
next prev parent reply other threads:[~2025-03-29 20:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-25 22:23 [PATCH 0/2] Fix mergetool.vimdiff.layout when "@" is used on REMOTE Fernando Ramos
2025-03-25 22:23 ` [PATCH 1/2] mergetools: vimdiff: fix layout where REMOTE is the target Fernando Ramos
2025-03-29 0:23 ` D. Ben Knoble
2025-03-29 20:46 ` Junio C Hamano [this message]
2025-03-25 22:23 ` [PATCH 2/2] mergetools: vimdiff: add tests for layout with REMOTE as " Fernando Ramos
2025-03-26 10:10 ` [PATCH 0/2] Fix mergetool.vimdiff.layout when "@" is used on REMOTE Fernando
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=xmqqa593d0p6.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ben.knoble+github@gmail.com \
--cc=git@vger.kernel.org \
--cc=greenfoo@u92.eu \
--cc=kawarimidoll+git@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.