Merge branch 'jc/clean' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 8 May 2006 23:43:23 +0000 (16:43 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 8 May 2006 23:43:23 +0000 (16:43 -0700)
* jc/clean:
  Teach git-clean optional <paths>... parameters.
  Separate object name errors from usage errors
  Documentation: {caret} fixes (git-rev-list.txt)
  Fix "git diff --stat" with long filenames
  Fix repo-config set-multivar error return path.

1  2 
diff.c
read-tree.c

diff --cc diff.c
Simple merge
diff --cc read-tree.c
Simple merge