diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 14:14:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 14:14:05 -0700 |
| commit | c8c398a6f8bcc99ada4d46b978e42188c7302b6b (patch) | |
| tree | 9a36bd3ee2c827f53e1f7c42e5db6185e58b908b /gitmodules.txt | |
| parent | 77bf41c9a06096eb0fa21adc316739f2e493f5d1 (diff) | |
| download | git-htmldocs-c8c398a6f8bcc99ada4d46b978e42188c7302b6b.tar.gz | |
Autogenerated HTML docs for v2.0.0-390-gcb682
Diffstat (limited to 'gitmodules.txt')
| -rw-r--r-- | gitmodules.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gitmodules.txt b/gitmodules.txt index 347a9f76e..f6c0dfd02 100644 --- a/gitmodules.txt +++ b/gitmodules.txt @@ -67,7 +67,9 @@ submodule.<name>.fetchRecurseSubmodules:: submodule.<name>.ignore:: Defines under what circumstances "git status" and the diff family show a submodule as modified. When set to "all", it will never be considered - modified, "dirty" will ignore all changes to the submodules work tree and + modified (but will nonetheless show up in the output of status and + commit when it has been staged), "dirty" will ignore all changes + to the submodules work tree and takes only differences between the HEAD of the submodule and the commit recorded in the superproject into account. "untracked" will additionally let submodules with modified tracked files in their work tree show up. |