Merge branch 'jc/diff' into next
commit4da8cbc234177d6a8cf749d4ef60bd05ec843898
authorJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 21:34:53 +0000 (11 14:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 21:34:53 +0000 (11 14:34 -0700)
treea97b17b67a77e6d9f9b7cdf0aa265594db2ddeb4
parentb5b1442ac35706ce1e3daed407dd935f0e9dd796
parentc4e05b1a2290c605e68e6dac5e2a580e6d4080b7
Merge branch 'jc/diff' into next

* jc/diff:
  blame and friends: adjust to multiple pathspec change.
  git log --full-diff
  tree-diff: do not assume we use only one pathspec
diff.h
http-push.c