add additional config settings for merge
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest3 patches 2 repliesIn review
- v33 patches 19 repliesSuperseded
- v22 patches 7 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 2 patches | 23 replies | Superseded |
Patches in v4 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | merge: update documentation for {merge,diff}.renameLimitDocumentation/ Documentation/ | +4 | 0 replies | |
| 2/3 | merge: Add merge.renames config settingDocumentation/ Documentation/ diff.c +4 more | +63 | 1 reply | |
| 3/3 | merge: pass aggressive when rename detection is turned offmerge-recursive.c | +1 | 0 replies |
Reviews trailers per patch
2 of 3 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Johannes Schindelin | Elijah Newren |
|---|---|---|
| Series | R-b | |
| 1/3 | ||
| 2/3 | R-b | Helped-by |
| 3/3 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v4 0/3] add additional config settings for merge
This version incorporates Elijah's fixup patch and is now based on en/rename-directory-detection in next.
Base Ref: en/rename-directory-detection
Web-Diff: https://github.com/benpeart/git/commit/16b175c25f
Checkout: git fetch https://github.com/benpeart/git merge-renames-v4 && git checkout 16b175c25f
### Patches
Ben Peart (3):
merge: update documentation for {merge,diff}.renameLimit
merge: Add merge.renames config setting
merge: pass aggressive when rename detection is turned off
Documentation/diff-config.txt | 3 ++- Documentation/merge-config.txt | 8 +++++- Documentation/merge-strategies.txt | 11 +++++--- diff.c | 2 +- diff.h | 1 + merge-recursive.c | 31 ++++++++++++++++++----- merge-recursive.h | 8 +++++- t/t3034-merge-recursive-rename-options.sh | 18 +++++++++++++ 8 files changed, 68 insertions(+), 14 deletions(-)
base-commit: c5b761fb2711542073cf1906c0e86a34616b79ae
Signature · 1 line
2.17.0.windows.1