Andrew's git / gitweb.git / diff
?
Merge branch 'js/diff-verbose-submodule'
authorJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:16:26 +0000 (20:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:16:26 +0000 (20:16 -0700)
* js/diff-verbose-submodule:
add tests for git diff --submodule
Add the --submodule option to the diff option family

1  2 
Makefile patch | diff1 | diff2 | blob | history
diff.c patch | diff1 | diff2 | blob | history
diff --cc Makefile
Simple merge
diff --cc diff.c
Simple merge