• Junio C Hamano's avatar
    Merge branch 'jl/submodule-ignore-diff' · cc34bb0b
    Junio C Hamano authored
    * 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
    cc34bb0b
commit.c 38.4 KB