diff options
| author | Thomas Gummerer <t.gummerer@gmail.com> | 2018-08-28 21:27:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-29 16:03:29 (GMT) |
| commit | f427869bde759e32c30e8ba7a4b20837d3806642 (patch) | |
| tree | be2af8c44ed90d7bb7c94e2e5f3478fa05bc2e62 /builtin/log.c | |
| parent | bc4caecf9557c765951897d8483b1514ebae74bf (diff) | |
| download | git-f427869bde759e32c30e8ba7a4b20837d3806642.zip git-f427869bde759e32c30e8ba7a4b20837d3806642.tar.gz git-f427869bde759e32c30e8ba7a4b20837d3806642.tar.bz2 | |
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>
Diffstat (limited to 'builtin/log.c')
0 files changed, 0 insertions, 0 deletions