diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-22 14:32:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-22 14:32:27 -0700 |
| commit | 1947bdbc31e8e1419bdfe90d2357c68919189c30 (patch) | |
| tree | dab40c45b1af3b48ea1fbe1c3d27317fd5e80af8 /Documentation/git-commit.txt | |
| parent | 66915b5d7cc9b66bf8c452bb62c67da371c21d90 (diff) | |
| parent | d6293d1f2cadcdf45f8ada7847a32b51fa5bf0a6 (diff) | |
| download | git-1947bdbc31e8e1419bdfe90d2357c68919189c30.tar.gz | |
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
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 7e8b4ff72c..d0fe192fb3 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -8,7 +8,7 @@ git-commit - Record changes to the repository SYNOPSIS -------- [verse] -'git-commit' [-a | --interactive] [-s] [-v] [-u] [--amend] +'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>...] @@ -162,13 +162,22 @@ 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>]:: + 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:: |