Thread (98 messages) flat view 98 messages, 6 authors, 2022-02-02

Re: [PATCH v3 0/9] Add a new --remerge-diff capability to show & log

From: Junio C Hamano <hidden>
Date: 2021-12-31 08:46:48

"Elijah Newren via GitGitGadget" [off-list ref] writes:
Changes since v2 (of the restarted submission):

 * Numerous small improvements suggested by Johannes Altmanninger
 * Avoid including conflict messages from inner merges (due to example
   pointed out by Ævar).
 * Added a "remerge" prefix to all the new diff headers (suggested by Junio
   in a previous round, but I couldn't come up with a good name before. It
   suddenly hit me that "remerge" is an obvious prefix to use, and even
   helps explain what the rest of the line is for.)
That sounds sensible.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help