Merge branch 'fix'
commit45f75a0167b4a4693f2c6005bf7db231ca91ecc8
authorJunio C Hamano <junkio@cox.net>
Mon, 8 May 2006 23:40:23 +0000 (8 16:40 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 8 May 2006 23:40:23 +0000 (8 16:40 -0700)
treed7cb273a493d3b37aad4a41284cd8e2fb68f80c4
parentfd60acaced6de16ebfb66959067e2b29f99a133e
parent31fff305bcc6db3b8082eac7fc9e441b27964fea
Merge branch 'fix'

* fix:
  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.
config.c
diff.c
merge-tree.c
revision.c