Merge branch 'np/delta' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 25 Apr 2006 05:31:15 +0000 (22:31 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 25 Apr 2006 05:31:15 +0000 (22:31 -0700)
commit5a6a8c0e012137a3f0059be40ec7b2f4aa614355
tree842b775b4a96a35e98372e3073f314b8c6d2ff08
parentdc844aaad83ede855fccc9af9b555796c9c758ad
parent08abe669c05521499149dbf84fedefb04a8fa34d
Merge branch 'np/delta' into next

* np/delta:
  split the diff-delta interface
  Document the configuration file
  Document git-var -l listing also configuration variables
  rev-parse: better error message for ambiguous arguments