diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-31 18:14:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-31 18:14:17 -0700 |
| commit | 6774e2bf0822cd4358620d3e806f9b3df8bd777e (patch) | |
| tree | 1372d1e4c440020d51dbba94ab6aa8d492eeb9a8 | |
| parent | Documentation/SubmittingPatches: Fix typo in GMail section (diff) | |
| parent | Documentation/config: describe status.submodulesummary (diff) | |
| download | tgif-6774e2bf0822cd4358620d3e806f9b3df8bd777e.tar.xz | |
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0:
Documentation/config: describe status.submodulesummary
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c3ebd4d07c..bcf3705759 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1681,6 +1681,13 @@ If this variable is not specified, it defaults to 'normal'. This variable can be overridden with the -u|--untracked-files option of linkgit:git-status[1] and linkgit:git-commit[1]. +status.submodulesummary:: + Defaults to false. + If this is set to a non zero number or true (identical to -1 or an + unlimited number), the submodule summary will be enabled and a + summary of commits for modified submodules will be shown (see + --summary-limit option of linkgit:git-submodule[1]). + tar.umask:: This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the |