Merge branch 'master' into jc/diff
commit6d46a23bf6e009487166f044b8c759aa734b8f90
authorJunio C Hamano <junkio@cox.net>
Mon, 10 Apr 2006 23:44:59 +0000 (10 16:44 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 10 Apr 2006 23:44:59 +0000 (10 16:44 -0700)
treeb6b3d18ff7a60585921674bc043fe6dd514a3f8c
parent52b70d56bd23811003a72866cc23a0a44b9da1b7
parent5910e997754e0a03f25457965bd9faf80f2f9854
Merge branch 'master' into jc/diff

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