Re: [PATCH 1/2] Change default merge backend from recursive to ort

Hi Elijah,

Le 2021-07-31 à 20:07, Elijah Newren via GitGitGadget a écrit :

From: Elijah Newren <redacted>


   * `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 ?

Thanks a lot for your work,

Philippe.