[PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts

[PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
---
 Documentation/git-submodule.txt |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 3a5aa01..1a16ff6 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -101,9 +101,10 @@ status::
 	currently checked out commit for each submodule, along with the
 	submodule path and the output of 'git describe' for the
 	SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
-	initialized and `+` if the currently checked out submodule commit
+	initialized, `+` if the currently checked out submodule commit
 	does not match the SHA-1 found in the index of the containing
-	repository. This command is the default command for 'git submodule'.
+	repository and `U` if the submodule has merge conflicts.
+	This command is the default command for 'git submodule'.
 +
 If '--recursive' is specified, this command will recurse into nested
 submodules, and show their status as well.
-- 
1.7.4

Re: [PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts

[Jens Lehmann]

Am 22.03.2011 09:56, schrieb Nicolas Morey-Chaisemartin:
> Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@morey-chaisemartin.com>
> ---
>  Documentation/git-submodule.txt |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
> index 3a5aa01..1a16ff6 100644
> --- a/Documentation/git-submodule.txt
> +++ b/Documentation/git-submodule.txt
> @@ -101,9 +101,10 @@ status::
>  	currently checked out commit for each submodule, along with the
>  	submodule path and the output of 'git describe' for the
>  	SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
> -	initialized and `+` if the currently checked out submodule commit
> +	initialized, `+` if the currently checked out submodule commit
>  	does not match the SHA-1 found in the index of the containing
> -	repository. This command is the default command for 'git submodule'.
> +	repository and `U` if the submodule has merge conflicts.

Nit: The submodule doesn't have merge conflicts, the superproject does.
Maybe something like this (but I suspect a native speaker can come up
with something better ;-):

+	repository and `U` if a merge of the submodule commits produced
+	a conflict.

> +	This command is the default command for 'git submodule'.
>  +
>  If '--recursive' is specified, this command will recurse into nested
>  submodules, and show their status as well.

And I'd propose to squash this one into the first patch, as it documents
the behavior change done there.