Keep merge during kills
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest4 patches 0 repliesNew
- v23 patches 10 repliesSuperseded
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | Documentation/git-merge: explain --continueDocumentation/ | +4 | 0 replies | |
| 2/4 | merge: clarify call chainbuiltin/ | +2 | 0 replies | |
| 3/4 | merge: split write_merge_state in twobuiltin/ | +8 | 0 replies | |
| 4/4 | merge: save merge state earlierbuiltin/ t/ | +17 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.
Cover letter [PATCH v3 0/4] Keep merge during kills
Compared to the 3-item v2:
1/4 == 1/3
2/4 is new as per Junio's suggestion: clarify the call-chain leading up to prepare_to_commit()
3/4 == 2/3 with amended subject
4/4 is 3/3 rebased, squash-if removed
Michael J Gruber (4):
Documentation/git-merge: explain --continue
merge: clarify call chain
merge: split write_merge_state in two
merge: save merge state earlier
Documentation/git-merge.txt | 5 ++++- builtin/merge.c | 15 ++++++++++++--- t/t7600-merge.sh | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-)
Signature · 1 line
2.14.1.426.g4352aa77a5