From: Elijah Newren <newren@gmail.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"Christian Couder" <chriscool@tuxfamily.org>,
"Derrick Stolee" <dstolee@microsoft.com>,
"Emily Shaffer" <emilyshaffer@google.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Jeff King" <peff@peff.net>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>,
"René Scharfe" <l.s.r@web.de>, "Taylor Blau" <me@ttaylorr.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH 1/2] Change default merge backend from recursive to ort
Date: Mon, 2 Aug 2021 21:39:51 -0600 [thread overview]
Message-ID: <CABPp-BGJ_ZfOPRdsjxnT8q9r9YPZUsnSmPoT0xuwJRJ3TN4wWA@mail.gmail.com> (raw)
In-Reply-To: <49b61447-06b7-9c43-fdd6-25adc45f2a88@gmail.com>
Hi Philippe,
On Mon, Aug 2, 2021 at 8:56 PM Philippe Blain
<levraiphilippeblain@gmail.com> wrote:
>
> Hi Elijah,
>
> Le 2021-07-31 à 20:07, Elijah Newren via GitGitGadget a écrit :
> > From: Elijah Newren <newren@gmail.com>
> >
> >
> > * `git diff AUTO_MERGE` -- ability to see what changes the user has
> > made to resolve conflicts so far (see commit 5291828df8 ("merge-ort:
> > write $GIT_DIR/AUTO_MERGE whenever we hit a conflict", 2021-03-20)
> >
> >
> > The last three have been implemented already (though only one has been
> > submitted upstream so far;
>
> From what I could find this indeed only refers to your 5291828df8 (merge-ort:
> write $GIT_DIR/AUTO_MERGE whenever we hit a conflict, 2021-03-20).
> This is a very nice improvement, but I noticed it is not mentioned in the doc.
> Do you plan to update the 'git diff' doc to mention that special ref ?
> (And maybe also gitrevisions(5), where most of the special refs are listed ?)
>
> Do you plan to implement a new '--auto-merge' option to 'git diff' as a shortcut
> to 'git diff AUTO_MERGE', in order to hide a bit the special ref from users ?
Fair point, it probably does deserve to be documented somewhere, at
least once ort is the default merge algorithm.
I don't think it'd make sense to include a reference to it in
gitrevisions(5), since $GIT_DIR/AUTO_MERGE is a reference to a tree
rather than to a revision. But documenting that special ref in
Documentation/git-diff.txt, and perhaps linking to it from other
conflict-related options (e.g. --base, --ours, --theirs) may make
sense. Your --auto-merge idea may also make sense, and it'd be
somewhat similar to how git-rebase has a --show-current-patch option
that is shorthand for `git show REBASE_HEAD` and is documented as
such. However, it might be confusing to users how to combine
--auto-merge with paths, whereas `git diff AUTO_MERGE -- pathname` is
pretty clear once you know that AUTO_MERGE is a tree you can diff
against. Hmmm....
next prev parent reply other threads:[~2021-08-03 3:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-01 0:07 [PATCH 0/2] [RFC] Switch default merge backend from recursive to ort Elijah Newren via GitGitGadget
2021-08-01 0:07 ` [PATCH 1/2] Change " Elijah Newren via GitGitGadget
2021-08-02 15:55 ` Ævar Arnfjörð Bjarmason
2021-08-02 16:33 ` Elijah Newren
2021-08-02 22:46 ` Johannes Schindelin
2021-08-03 1:04 ` Elijah Newren
2021-08-03 2:56 ` Philippe Blain
2021-08-03 3:39 ` Elijah Newren [this message]
2021-08-01 0:07 ` [PATCH 2/2] Update docs for change of default merge backend Elijah Newren via GitGitGadget
2021-08-02 14:59 ` Derrick Stolee
2021-08-03 14:39 ` Elijah Newren
2021-08-02 15:05 ` [PATCH 0/2] [RFC] Switch default merge backend from recursive to ort Derrick Stolee
2021-08-02 16:27 ` Elijah Newren
2021-08-02 18:03 ` Derrick Stolee
2021-08-03 15:56 ` Jeff King
2021-08-03 16:57 ` Elijah Newren
2021-08-03 17:13 ` Jeff King
2021-08-03 22:08 ` Junio C Hamano
2021-08-03 22:37 ` Jeff King
2021-08-03 22:48 ` Elijah Newren
2021-08-03 22:46 ` Elijah Newren
2021-08-04 5:38 [PATCH 0/2] " Elijah Newren via GitGitGadget
2021-08-04 5:38 ` [PATCH 1/2] Change " Elijah Newren via GitGitGadget
2021-08-09 17:38 ` Phillip Wood
2021-08-09 21:01 ` Elijah Newren
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=CABPp-BGJ_ZfOPRdsjxnT8q9r9YPZUsnSmPoT0xuwJRJ3TN4wWA@mail.gmail.com \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=dstolee@microsoft.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=l.s.r@web.de \
--cc=levraiphilippeblain@gmail.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.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 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 NNTP newsgroup(s).