My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fdfaf0 30211fb)
Merge branch 'oa/doc-diff-check'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Apr 2016 21:29:13 +0000 (14:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Apr 2016 21:29:13 +0000 (14:29 -0700)
A minor documentation update.

* oa/doc-diff-check:
  Documentation: git diff --check detects conflict markers


Trivial merge
The core git plumbing