From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Aug 2010 19:36:25 +0000 (-0700)
Subject: Merge branch 'jl/submodule-ignore-diff'
X-Git-Tag: v1.7.3-rc0~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cc34bb0b0279a79117978cf220d70b1c14da05ca;p=git.git

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
---

cc34bb0b0279a79117978cf220d70b1c14da05ca
diff --cc diff.c
index bf65892f7,1ddfdfbc2..ccc9f1f64
--- a/diff.c
+++ b/diff.c
@@@ -2819,7 -2820,8 +2826,7 @@@ static void run_checkdiff(struct diff_f
  
  void diff_setup(struct diff_options *options)
  {
- 	memset(options, 0, sizeof(*options));
+ 	memcpy(options, &default_diff_options, sizeof(*options));
 -	memset(&diff_queued_diff, 0, sizeof(diff_queued_diff));
  
  	options->file = stdout;