From: Junio C Hamano Date: Mon, 4 Apr 2011 10:41:24 +0000 (-0700) Subject: Merge branch 'nm/maint-conflicted-submodule-entries' X-Git-Tag: v1.7.5-rc1~7 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1eb71bc0ec609c67b8a308f9267691144a48bffd?hp=-c Merge branch 'nm/maint-conflicted-submodule-entries' * nm/maint-conflicted-submodule-entries: submodule: process conflicting submodules only once --- 1eb71bc0ec609c67b8a308f9267691144a48bffd diff --combined Documentation/git-submodule.txt index 3a5aa01435,e8ed2f2c0f..1a16ff6044 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@@ -101,9 -101,10 +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. @@@ -257,6 -258,11 +258,6 @@@ This file should be formatted in the sa to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5] for details. - -AUTHOR ------- -Written by Lars Hjemli - GIT --- Part of the linkgit:git[1] suite