]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bdc5341) | patch
doc: replay: mention no output on conflicts
authorKristoffer Haugsbakk <code@khaugsbakk.name>
Sat, 13 Dec 2025 13:46:56 +0000 (14:46 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Dec 2025 06:56:01 +0000 (15:56 +0900)
commit8467c95419acaa826a6c1ca0db0f36a3fd614ae4
treeb0f76e941887e1131ce52f8884de5f5c386567b3tree
parentbdc5341ff65278a3cc80b2e8a02a2f02aa1fac06commit | diff
doc: replay: mention no output on conflicts

Some commands will produce output on stderr if there are conflicts, but
git-replay(1) is completely silent. Explicitly spell that out.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-replay.adoc diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.