]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5afa69b 9919f41)
Merge branch 'jc/diff'
authorJunio C Hamano <junkio@cox.net>
Fri, 28 Jul 2006 19:23:52 +0000 (12:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 28 Jul 2006 19:23:52 +0000 (12:23 -0700)
* jc/diff:
  git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B"

1  2 
builtin-diff.c patch | diff1 | diff2 | blob | history

diff --cc builtin-diff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.