Junio C Hamano d88949d86e Merge branch 'tg/rerere-doc-updates' ...

Clarify a part of technical documentation for rerere.

* tg/rerere-doc-updates:
  rerere: add note about files with existing conflict markers
  rerere: mention caveat about unmatched conflict markers

2018-09-17 13:53:57 -07:00

..

.gitignore

…

api-allocation-growing.txt

…

api-argv-array.txt

…

api-config.txt

…

api-credentials.txt

…

api-diff.txt

…

api-directory-listing.txt

…

api-error-handling.txt

…

api-gitattributes.txt

…

api-grep.txt

…

api-history-graph.txt

…

api-index-skel.txt

…

api-index.sh

…

api-merge.txt

…

api-object-access.txt

…

api-oid-array.txt

…

api-parse-options.txt

…

api-quote.txt

…

api-ref-iteration.txt

…

api-remote.txt

…

api-revision-walking.txt

…

api-run-command.txt

…

api-setup.txt

…

api-sigchain.txt

…

api-submodule-config.txt

…

api-trace.txt

…

api-tree-walking.txt

…

api-xdiff-interface.txt

…

bitmap-format.txt

…

commit-graph-format.txt

…

commit-graph.txt

…

directory-rename-detection.txt

…

hash-function-transition.txt

…

http-protocol.txt

…

index-format.txt

…

long-running-process-protocol.txt

…

multi-pack-index.txt

…

pack-format.txt

…

pack-heuristics.txt

…

pack-protocol.txt

…

partial-clone.txt

…

protocol-capabilities.txt

…

protocol-common.txt

…

protocol-v2.txt

…

racy-git.txt

…

repository-version.txt

…

rerere.txt

rerere: mention caveat about unmatched conflict markers

2018-08-29 08:54:11 -07:00

send-pack-pipeline.txt

…

shallow.txt

…

signature-format.txt

…

trivial-merge.txt

…