Junio C Hamano cc34bb0b02 Merge branch 'jl/submodule-ignore-diff' ...

* jl/submodule-ignore-diff:
  Add tests for the diff.ignoreSubmodules config option
  Add the 'diff.ignoreSubmodules' config setting
  Submodules: Use "ignore" settings from .gitmodules too for diff and status
  Submodules: Add the new "ignore" config option for diff and status

Conflicts:
	diff.c

2010-08-18 12:36:25 -07:00

38 KiB

Raw Blame History

View Raw