Simon Hausmann <simon@xxxxxx> writes: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 5331b45..e42ead0 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -214,6 +214,11 @@ core.ignoreStat:: > See linkgit:git-update-index[1]. > False by default. > > +core.showUntrackedFiles:: > + A boolean to enable/disable displaying untracked files in the output > + of linkgit:git-status[1] and linkgit:git-commit[1]. > + Defaults to true. > + This does not belong to the 'core.*', which is about the low-level plumbing. It perhaps could live in 'status.*' section, but I think you can do better than introducing this as a boolean. > diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt > index c3c9f5b..a3174e4 100644 > --- a/Documentation/git-commit.txt > +++ b/Documentation/git-commit.txt > @@ -150,12 +150,17 @@ but can be used to amend a merge commit. > the last commit without committing changes that have > already been staged. > > +-U|--untracked:: > + Show untracked files, in the "Untracked files:" section of commit > + message template. > + This option overrides the core.showUntrackedFiles > + configuration option, and is normally not needed. > + > -u|--untracked-files:: > Show all untracked files, also those in uninteresting > - directories, in the "Untracked files:" section of commit > - message template. Without this option only its name and > + directories. Without this option only its name and > a trailing slash are displayed for each untracked > - directory. > + directory. This option implies --untracked. I wonder if we really need a new option that is half independent to an existing one. Step back a bit and think. You have three choice: (1) Do not show untracked files at all; or (2) Show untracked but summarize untracked directories; or (3) Show all untracked files. We have had (2) and (3) so far, and you are adding (1) as a new feature. How about allowing -u on the command line to take an optional parameter to say what kind the user wants? I.e. -u=none shows nothing (i.e. (1)) -u=normal shows summarized report (i.e. (2)) -u=all shows all untracked files (i.e. (3)) And (3) can also be spelled as "-u without parameter"; absense of -u anywhere defaults to (2). That would be the first patch. Then, in the second patch, you can add support to 'status.showuntracked'; you pretend that it is set to 'normal' if it is not defined in the configuration file. Hmm? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html