Junio C Hamano ffe84bbc1f Merge branch 'jl/submodule-ignore-diff' into next ...

* 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
	submodule.c

2010-08-12 18:55:31 -07:00

38 KiB

Raw Blame History

View Raw