[PATCH v3 0/2] cherry-pick: document that --no-commit skips CHERRY_PICK_HEAD
- From
Aleksei Sviridkin <f@lex.la>
- Date
- Sep 5, 2026, 17:13 UTC
- Message-ID
- <20260905171332.34670-1-f@lex.la>
- In-Reply-To
- <20260903125524.67889-1-f@lex.la>
v2 was doc-only. I had dropped the test claiming the existing clean-pick test already covered it, which was wrong: nothing checks the ref after a conflicting --no-commit pick. 1/2 puts it back as a single test_ref_missing call in the existing conflicting-pick test.
2/2 drops the "git commit -c" advice, which belongs in git-commit documentation, and says instead that the missing ref is the point of the option rather than a wrinkle.
The Assisted-by trailer is gone from both.
Aleksei Sviridkin (2): t3507: check no CHERRY_PICK_HEAD after conflicting --no-commit doc: cherry-pick: note --no-commit skips CHERRY_PICK_HEAD
Documentation/git-cherry-pick.adoc | 8 +++++++- t/t3507-cherry-pick-conflict.sh | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-)
base-commit: e9019fcafe0040228b8631c30f97ae1adb61bcdc
-- 2.55.0