]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f9817e 801235c)
Merge branch 'jc/diff'
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:36:02 +0000 (14:36 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Jun 2006 21:36:02 +0000 (14:36 -0700)
* jc/diff:
  diff --color: use $GIT_DIR/config

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

diff --cc diff.c
Simple merge
local clone of git.git