Merge branch 'mo/status-untracked'

* mo/status-untracked:
  Add configuration option for default untracked files mode
  Add argument 'no' commit/status option -u|--untracked-files
  Add an optional <mode> argument to commit/status -u|--untracked-files option

Conflicts:

	Documentation/git-commit.txt

diff --cc Documentation/git-commit.txt
index 7e8b4ff72c0192f01523118b9a8caeddbcbda09c,2e5ea22a40fd64f3b949099006b54ef493a4993b..d0fe192fb315e62d0daa2d468bd5709601abbe5d
--- 1/Documentation/git-commit.txt
--- 2/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -8,9 -8,9 +8,9 @@@ git-commit - Record changes to the repo
  SYNOPSIS
  --------
  [verse]
- 'git-commit' [-a | --interactive] [-s] [-v] [-u] [--amend]
 -'git-commit' [-a | --interactive] [-s] [-v] [-u[<mode>]]
 -         [(-c | -C) <commit> | -F <file> | -m <msg> | --amend]
 -         [--allow-empty] [--no-verify] [-e] [--author <author>]
++'git-commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend]
 +         [(-c | -C) <commit>] [-F <file> | -m <msg>]
 +         [--allow-empty] [--no-verify] [-e] [--author=<author>]
           [--cleanup=<mode>] [--] [[-i | -o ]<file>...]
  
  DESCRIPTION
@@@ -162,16 -150,23 +162,25 @@@ but can be used to amend a merge commit
        the last commit without committing changes that have
        already been staged.
  
- -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
-       a trailing slash are displayed for each untracked
-       directory.
 --u[<mode>]|--untracked-files[=<mode>]::
++-u[<mode>]::
++--untracked-files[=<mode>]::
+       Show untracked files (Default: 'all').
+ +
+ The mode parameter is optional, and is used to specify
+ the handling of untracked files. The possible options are:
+ +
+ --
+       - 'no'     - Show no untracked files
+       - 'normal' - Shows untracked files and directories
+       - 'all'    - Also shows individual files in untracked directories.
+ --
+ +
+ See linkgit:git-config[1] for configuration variable
+ used to change the default for when the option is not
+ specified.
  
 --v|--verbose::
 +-v::
 +--verbose::
        Show unified diff between the HEAD commit and what
        would be committed at the bottom of the commit message
        template.  Note that this diff output doesn't have its

diff --cc builtin-commit.c
Simple merge