]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bc4caec) | patch
rerere: add note about files with existing conflict markers
authorThomas Gummerer <t.gummerer@gmail.com>
Tue, 28 Aug 2018 21:27:44 +0000 (22:27 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2018 16:03:29 +0000 (09:03 -0700)
commitf427869bde759e32c30e8ba7a4b20837d3806642
treebe2af8c44ed90d7bb7c94e2e5f3478fa05bc2e62tree | snapshot
parentbc4caecf9557c765951897d8483b1514ebae74bfcommit | diff
rerere: add note about files with existing conflict markers

When a file contains lines that look like conflict markers, 'git
rerere' may fail not be able to record a conflict resolution.
Emphasize that in the man page, and mention a possible workaround for
the issue.

Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rerere.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.