Skip to content

Merge renormalization, config renamed

Eyvind Bernhardsen git 4 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest3 patches 1 replyIn review
  2. v54 patches 8 repliesSuperseded
  3. v43 patches 1 replySuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v33 patches5 repliesSuperseded

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3Avoid conflicts when merging branches with mixed normalizationDocumentation/gitattributes.txt Documentation/merge-config.txt builtin/merge.c +5 more+143 -20 replies
2/3Try normalizing files to avoid delete/modify conflicts when mergingmerge-recursive.c t/t6038-merge-text-auto.sh+50 -30 replies
3/3Don't expand CRLFs when normalizing text during mergeconvert.c+20 -70 replies

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchJunio C HamanoEyvind Bernhardsen
SeriesImproved-by A-b
1/3
2/3
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v6 thread

Cover letter [PATCH v6 0/3] Merge renormalization, config renamed

Here's a new version of the merge normalization series that renames the configuration variable. Since "merge.renormalize" got the best response, I went with that.

Junio, I hope you don't mind that I squashed your patch to introduce the config variable into the first patch. It seemed a bit out-of-place as a separate commit.

- Eyvind

Eyvind Bernhardsen (3):
Avoid conflicts when merging branches with mixed normalization Try normalizing files to avoid delete/modify conflicts when merging Don't expand CRLFs when normalizing text during merge

 Documentation/gitattributes.txt |   34 ++++++++++++++++++++
 Documentation/merge-config.txt  |   10 ++++++
 builtin/merge.c                 |    3 ++
 cache.h                         |    2 +
 convert.c                       |   37 +++++++++++++++++++----
 environment.c                   |    1 +
 ll-merge.c                      |   15 +++++++++
 merge-recursive.c               |   51 +++++++++++++++++++++++++++++-
 t/t6038-merge-text-auto.sh      |   64 +++++++++++++++++++++++++++++++++++++++
 9 files changed, 209 insertions(+), 8 deletions(-)
 create mode 100755 t/t6038-merge-text-auto.sh
Signature · 1 line
1.7.1.575.g383de

Read the cover letter in its thread