{"thread":{"id":"26821","subject":"[PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts","startedAt":"2011-03-22T08:56:18Z","lastAt":"2011-03-22T19:23:34Z","messageCount":2,"participants":["Nicolas Morey-Chaisemartin","Jens Lehmann"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"164024","messageId":"4D886432.6060007@kalray.eu","threadId":"26821","inReplyTo":"51d033dc2978d62164dcb76b679bb7ebd9bc1802.1300784018.git.nmorey@kalray.eu","subject":"[PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts","fromName":"Nicolas Morey-Chaisemartin","fromEmail":"nmorey@kalray.eu","sentAt":"2011-03-22T08:56:18Z","receivedAt":"2011-03-22T08:56:18Z","isPatch":true,"sender":{"key":"devel-git@morey-chaisemartin.com","avatar":"https://avatars.githubusercontent.com/u/108326?v=4"},"body":"Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>\n---\n Documentation/git-submodule.txt |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\nindex 3a5aa01..1a16ff6 100644\n--- a/Documentation/git-submodule.txt\n+++ b/Documentation/git-submodule.txt\n@@ -101,9 +101,10 @@ status::\n \tcurrently checked out commit for each submodule, along with the\n \tsubmodule path and the output of 'git describe' for the\n \tSHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not\n-\tinitialized and `+` if the currently checked out submodule commit\n+\tinitialized, `+` if the currently checked out submodule commit\n \tdoes not match the SHA-1 found in the index of the containing\n-\trepository. This command is the default command for 'git submodule'.\n+\trepository and `U` if the submodule has merge conflicts.\n+\tThis command is the default command for 'git submodule'.\n +\n If '--recursive' is specified, this command will recurse into nested\n submodules, and show their status as well.\n-- \n1.7.4\n"},{"id":"164081","messageId":"4D88F736.209@web.de","threadId":"26821","inReplyTo":"4D886432.6060007@kalray.eu","subject":"Re: [PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2011-03-22T19:23:34Z","receivedAt":"2011-03-22T19:23:34Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"Am 22.03.2011 09:56, schrieb Nicolas Morey-Chaisemartin:\n> Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>\n> ---\n>  Documentation/git-submodule.txt |    5 +++--\n>  1 files changed, 3 insertions(+), 2 deletions(-)\n> \n> diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\n> index 3a5aa01..1a16ff6 100644\n> --- a/Documentation/git-submodule.txt\n> +++ b/Documentation/git-submodule.txt\n> @@ -101,9 +101,10 @@ status::\n>  \tcurrently checked out commit for each submodule, along with the\n>  \tsubmodule path and the output of 'git describe' for the\n>  \tSHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not\n> -\tinitialized and `+` if the currently checked out submodule commit\n> +\tinitialized, `+` if the currently checked out submodule commit\n>  \tdoes not match the SHA-1 found in the index of the containing\n> -\trepository. This command is the default command for 'git submodule'.\n> +\trepository and `U` if the submodule has merge conflicts.\n\nNit: The submodule doesn't have merge conflicts, the superproject does.\nMaybe something like this (but I suspect a native speaker can come up\nwith something better ;-):\n\n+\trepository and `U` if a merge of the submodule commits produced\n+\ta conflict.\n\n> +\tThis command is the default command for 'git submodule'.\n>  +\n>  If '--recursive' is specified, this command will recurse into nested\n>  submodules, and show their status as well.\n\nAnd I'd propose to squash this one into the first patch, as it documents\nthe behavior change done there.\n"}]}