diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-08 11:34:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-08 11:34:34 -0700 |
| commit | ff5702c52d66773ca5f32b46f9669880437e82e8 (patch) | |
| tree | 142e8e80f53d2e7bcdab2fdce5eb5db1f5dcb997 | |
| parent | 25c08907a0a178d352b318f8d1de15d2680394ff (diff) | |
| parent | 8f6811efed5451c72aac53f8ee12b1edcd426a73 (diff) | |
| download | git-ff5702c52d66773ca5f32b46f9669880437e82e8.tar.gz git-ff5702c52d66773ca5f32b46f9669880437e82e8.tar.xz | |
Merge branch 'os/commit-submodule-ignore' into maint
"git status" honored the ignore=dirty settings in .gitmodules but
"git commit" didn't.
* os/commit-submodule-ignore:
commit: pay attention to submodule.$name.ignore in .gitmodules
| -rw-r--r-- | builtin/commit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 62028e7b4..7a83cae6f 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1452,6 +1452,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) usage_with_options(builtin_commit_usage, builtin_commit_options); wt_status_prepare(&s); + gitmodules_config(); git_config(git_commit_config, &s); determine_whence(&s); s.colopts = 0; |