projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5b1442 c4e05b1)
Merge branch 'jc/diff' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 21:34:53 +0000 (14:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 21:34:53 +0000 (14:34 -0700)
* jc/diff:
  blame and friends: adjust to multiple pathspec change.
  git log --full-diff
  tree-diff: do not assume we use only one pathspec

1  2 
diff.h patch | diff1 | diff2 | blob | history
http-push.c patch | diff1 | diff2 | blob | history

diff --cc diff.h
Simple merge
diff --cc http-push.c
Simple merge
The core git plumbing