Merge branch 'js/diff-verbose-submodule'
commitd39d667169fda640065d48b70288c3342bd3195d
authorJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:16:26 +0000 (30 20:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 Oct 2009 03:16:26 +0000 (30 20:16 -0700)
treefda6348bfc52ac132837c3f6816addb8bf85c20e
parente3de372e135e765749426a0165e893283192e38c
parent86140d56c150aa17e6c98dde4ba669516f3c302a
Merge branch 'js/diff-verbose-submodule'

* js/diff-verbose-submodule:
  add tests for git diff --submodule
  Add the --submodule option to the diff option family
Makefile
diff.c