diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-01 12:58:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-01 12:58:52 -0700 |
| commit | 69759917aa4b1efb5bf198e76c3664bed9c70d4d (patch) | |
| tree | 28d90192dff1026e69b25bbdc0822d05d7fc7402 /builtin/commit.c | |
| parent | 4dbf436bffdf43f91852e23018fc0e45c1bfdab8 (diff) | |
| parent | 8f6811efed5451c72aac53f8ee12b1edcd426a73 (diff) | |
| download | git-69759917aa4b1efb5bf198e76c3664bed9c70d4d.tar.gz git-69759917aa4b1efb5bf198e76c3664bed9c70d4d.tar.xz | |
Merge branch 'os/commit-submodule-ignore'
"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
Diffstat (limited to 'builtin/commit.c')
| -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 4d5048483..a17a5df44 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1419,6 +1419,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; |