diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-20 10:38:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-20 10:38:42 -0800 |
| commit | 1958e5be90be7bba3037b8a7853f0fb64f24fc09 (patch) | |
| tree | f75e5739c7e43bb1f3b790afdb3dc425f28f268b /Documentation | |
| parent | 50c19c777d7b219914b4149e9a465542e3cb5700 (diff) | |
| parent | b39c3612eb443e77bd04d645578e1155988c6dde (diff) | |
| download | git-1958e5be90be7bba3037b8a7853f0fb64f24fc09.tar.gz | |
Merge branch 'maint'
* maint:
git-p4: fix bug in symlink handling
t1450: fix testcases that were wrongly expecting failure
Documentation: Fix indentation problem in git-commit(1)
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index e99bb14754..64fb458b45 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -197,13 +197,13 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].) Show untracked files (Default: 'all'). + The mode parameter is optional, and is used to specify -the handling of untracked files. The possible options are: +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 |