Skip to content

More merge cleanups

Elijah Newren git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 1 replyIn review
  2. v14 patches 6 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2merge-recursive: improve auto-merging messages with path collisionsmerge-recursive.c+2 -20 replies
2/2merge-recursive: avoid showing conflicts with merge branch before HEADmerge-recursive.c t/t6036-recursive-corner-cases.sh+36 -51 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/2] More merge cleanups

This series adds a few more cleanups on top of en/merge-cleanup. Changes since v1:
- Removed two patches that will instead be included in a follow-on series, as suggested by Junio.
- Incorporated commit message cleanups (capitalization and indents) made by Junio to the previous round.

Elijah Newren (2):
merge-recursive: improve auto-merging messages with path collisions
merge-recursive: avoid showing conflicts with merge branch before HEAD

 merge-recursive.c                 | 37 ++++++++++++++++++++++++++++---
 t/t6036-recursive-corner-cases.sh |  8 +++----
 2 files changed, 38 insertions(+), 7 deletions(-)
Signature · 1 line
2.19.1.280.g0c175526bf

Read the cover letter in its thread