--remerge-diff
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest8 patches 9 repliesIn review
- v28 patches 7 repliesSuperseded
- v19 patches 1 replySuperseded
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/8 | merge-recursive: remove dead conditional in update_stages()merge-recursive.c | +2 | 0 replies | |
| 2/8 | merge-recursive: internal flag to avoid touching the worktreemerge-recursive.c merge-recursive.h | +22 | 1 reply | |
| 3/8 | merge-recursive: -Xindex-only to leave worktree unchangedDocumentation/ merge-recursive.c t/ | +19 | 0 replies | |
| 4/8 | combine-diff: do not pass revs->dense_combined_merges redundantlybuiltin/ combine-diff.c diff-lib.c +3 more | +17 | 2 replies | |
| 5/8 | Fold all merge diff variants into an enumbuiltin/ builtin/ builtin/ +9 more | +44 | 1 reply | |
| 6/8 | merge-recursive: allow storing conflict hunks in indexDocumentation/ merge-recursive.c merge-recursive.h +1 more | +30 | 1 reply | |
| 7/8 | name-hash: allow dir hashing even when !ignore_casecache.h name-hash.c | +10 | 1 reply | |
| 8/8 | log --remerge-diff: show what the conflict resolution changedDocumentation/ log-tree.c merge-recursive.c +4 more | +534 | 3 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.
Cover letter [PATCH v3 0/8] --remerge-diff
This is a resend of the remerge-diff patch series, previously posted here:
http://thread.gmane.org/gmane.comp.version-control.git/242514
Differences to the previous version:
- Rebased onto the new {name,dir}_hash maps (7/8 looks very different now). This also allows freeing index entries that we no longer need (in 8/8); previously, the insert-only name-hash kept them alive.
- Adaptations to match Duy's changes to cache_tree handling (in 8/8). Please review the cache_tree handling extra carefully, as I'm not 100% convinced the dance there is all that is needed.
Thomas Rast (8):
merge-recursive: remove dead conditional in update_stages()
merge-recursive: internal flag to avoid touching the worktree
merge-recursive: -Xindex-only to leave worktree unchanged
combine-diff: do not pass revs->dense_combined_merges redundantly Fold all merge diff variants into an enum
merge-recursive: allow storing conflict hunks in index
name-hash: allow dir hashing even when !ignore_case log --remerge-diff: show what the conflict resolution changed
Documentation/merge-strategies.txt | 9 ++ Documentation/rev-list-options.txt | 7 + builtin/diff-files.c | 5 +- builtin/diff-tree.c | 2 +- builtin/diff.c | 12 +- builtin/fmt-merge-msg.c | 2 +- builtin/log.c | 9 +- builtin/merge.c | 1 - cache.h | 2 + combine-diff.c | 13 +- diff-lib.c | 13 +- diff.h | 6 +- log-tree.c | 303 ++++++++++++++++++++++++++++++++++++- merge-recursive.c | 52 ++++--- merge-recursive.h | 3 + name-hash.c | 13 +- revision.c | 15 +- revision.h | 24 ++- submodule.c | 3 +- t/t3030-merge-recursive.sh | 33 ++++ t/t4213-log-remerge-diff.sh | 222 +++++++++++++++++++++++++++ 21 files changed, 673 insertions(+), 76 deletions(-) create mode 100755 t/t4213-log-remerge-diff.sh
Signature · 1 line
2.1.0.72.g9b94086