From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Apr 2006 23:44:59 +0000 (-0700)
Subject: Merge branch 'master' into jc/diff
X-Git-Tag: v1.3.0-rc4~18^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d46a23bf6e009487166f044b8c759aa734b8f90?hp=6d46a23bf6e009487166f044b8c759aa734b8f90

Merge branch 'master' into jc/diff

* master:
Make "--parents" logs also be incremental
Retire diffcore-pathspec.
Improve the git-diff-tree -c/-cc documentation
---