{"thread":{"id":"45743","subject":"[PATCH] gitmodules: clarify the ignore option values","startedAt":"2017-04-19T09:15:22Z","lastAt":"2017-04-19T09:15:22Z","messageCount":1,"participants":["Sebastian Schuberth"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"317205","messageId":"0102015b857e8d20-1c33bac0-0e25-4afd-a533-48f37a09a83f-000000@eu-west-1.amazonses.com","threadId":"45743","inReplyTo":null,"subject":"[PATCH] gitmodules: clarify the ignore option values","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2017-04-19T09:15:15Z","receivedAt":"2017-04-19T09:15:22Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Add more structure and describe each possible option in a self-contained\nway, not referring to any of the previously described options.\n\nSigned-off-by: Sebastian Schuberth <sschuberth@gmail.com>\n---\n Documentation/gitmodules.txt | 31 ++++++++++++++++++++-----------\n 1 file changed, 20 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt\nindex 8f7c50f..4700624 100644\n--- a/Documentation/gitmodules.txt\n+++ b/Documentation/gitmodules.txt\n@@ -66,17 +66,26 @@ submodule.<name>.fetchRecurseSubmodules::\n \n submodule.<name>.ignore::\n \tDefines under what circumstances \"git status\" and the diff family show\n-\ta submodule as modified. When set to \"all\", it will never be considered\n-\tmodified (but will nonetheless show up in the output of status and\n-\tcommit when it has been staged), \"dirty\" will ignore all changes\n-\tto the submodules work tree and\n-\ttakes only differences between the HEAD of the submodule and the commit\n-\trecorded in the superproject into account. \"untracked\" will additionally\n-\tlet submodules with modified tracked files in their work tree show up.\n-\tUsing \"none\" (the default when this option is not set) also shows\n-\tsubmodules that have untracked files in their work tree as changed.\n-\tIf this option is also present in the submodules entry in .git/config of\n-\tthe superproject, the setting there will override the one found in\n+\ta submodule as modified. The following values are supported:\n+\n+\tall;; The submodule will never be considered modified (but will\n+\t    nonetheless show up in the output of status and commit when it has\n+\t    been staged).\n+\n+\tdirty;; All changes to the submodule's work tree will be ignored, only\n+\t    committed differences between the HEAD of the submodule and its\n+\t    recorded state in the superproject are taken into account.\n+\n+\tuntracked;; Only untracked files in submodules will be ignored.\n+\t    Committed differences and modifications to tracked files will show\n+\t    up.\n+\n+\tnone;; No modifiations to submodules are ignored, all of committed\n+\t    differences, and modifications to tracked and untracked files are\n+\t    shown. This is the default option.\n+\n+\tIf this option is also present in the submodules entry in .git/config\n+\tof the superproject, the setting there will override the one found in\n \t.gitmodules.\n \tBoth settings can be overridden on the command line by using the\n \t\"--ignore-submodule\" option. The 'git submodule' commands are not\n\n--\nhttps://github.com/git/git/pull/348\n"}]}