* [PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts [not found] <51d033dc2978d62164dcb76b679bb7ebd9bc1802.1300784018.git.nmorey@kalray.eu> @ 2011-03-22 8:56 ` Nicolas Morey-Chaisemartin 2011-03-22 19:23 ` Jens Lehmann 0 siblings, 1 reply; 2+ messages in thread From: Nicolas Morey-Chaisemartin @ 2011-03-22 8:56 UTC (permalink / raw) To: git 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 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts 2011-03-22 8:56 ` [PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts Nicolas Morey-Chaisemartin @ 2011-03-22 19:23 ` Jens Lehmann 0 siblings, 0 replies; 2+ messages in thread From: Jens Lehmann @ 2011-03-22 19:23 UTC (permalink / raw) To: Nicolas Morey-Chaisemartin; +Cc: git 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. ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-22 19:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <51d033dc2978d62164dcb76b679bb7ebd9bc1802.1300784018.git.nmorey@kalray.eu>
2011-03-22 8:56 ` [PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts Nicolas Morey-Chaisemartin
2011-03-22 19:23 ` Jens Lehmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).