]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c9eaaab 6ed7dda)
Merge branch 'jl/maint-diff-ignore-submodules'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:37 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:37 +0000 (11:55 -0700)
commite1165dd1442017c2b2722027168c497640f25746
tree6b1d95aa8cd3a213bfee6eee59de308da028068atree | snapshot
parentc9eaaab4165d8f402930d12899ec097495b599e6commit | diff
parent6ed7ddaadba9217b794aecf6d74a2e455daf7a96commit | diff
Merge branch 'jl/maint-diff-ignore-submodules'

* jl/maint-diff-ignore-submodules:
  t4027,4041: Use test -s to test for an empty file
  Add optional parameters to the diff option "--ignore-submodules"
  git diff: rename test that had a conflicting name
Documentation/diff-options.txt diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.