projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 06d11b2 90e1452)
Merge branch 'jl/submodule-ignore-diff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:36:25 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 19:36:25 +0000 (12:36 -0700)
commitcc34bb0b0279a79117978cf220d70b1c14da05ca
tree83ea20e7109b8d96caf0aeed855656d03968f0dftree | snapshot
parent06d11b2e8d9d78d01212024f0f410e4193cbb5bdcommit | diff
parent90e14525f22c2980d4375dcb5d79e6d5da293a78commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/diff-options.txt diff1 | diff2 | blob | history
builtin/commit.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
Git—the stupid content tracker