Miscellaneous fixups preparing for the removal of merge-recursive
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest5 patches 0 repliesNew
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/5 | stash: remove merge-recursive.h includebuiltin/ | +0 | 0 replies | |
| 2/5 | t6423: fix a comment that accidentally reversed two commitst/ | +3 | 0 replies | |
| 3/5 | t7615: be more explicit about diff algorithm usedt/ | +2 | 0 replies | |
| 4/5 | merge-ort: fix accidental strset<->strintmapmerge-ort.c | +2 | 0 replies | |
| 5/5 | merge-ort: remove extraneous word in commentmerge-ort.c | +3 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/5] Miscellaneous fixups preparing for the removal of merge-recursive
While working on the removal of merge recursive, there were a handful of miscellaneous fixups, none of which changed any behavior. Each is a very small localized change. This does not depend on any other PRs, and in fact each commit in this series is orthogonal. I'm just grouping them because they are all tiny, miscellaneous fixups.
Elijah Newren (5):
stash: remove merge-recursive.h include
t6423: fix a comment that accidentally reversed two commits
t7615: be more explicit about diff algorithm used
merge-ort: fix accidental strset<->strintmap
merge-ort: remove extraneous word in comment
builtin/stash.c | 1 - merge-ort.c | 10 +++++----- t/t6423-merge-rename-directories.sh | 6 +++--- t/t7615-diff-algo-with-mergy-operations.sh | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-)
base-commit: c9d3534de317f31915f37e9d9c0d52d4cf901482
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1882%2Fnewren%2Fendit-misc-fixups-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1882/newren/endit-misc-fixups-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1882
Signature · 1 line
gitgitgadget