]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 881c019 f427869)
Merge branch 'tg/rerere-doc-updates'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:56 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:57 +0000 (13:53 -0700)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.