{"thread":{"id":"26559","subject":"[PATCH] Documentation: default -u is 'normal'","startedAt":"2011-02-19T16:30:08Z","lastAt":"2011-02-21T20:05:25Z","messageCount":3,"participants":["Clemens Buchacher","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"161633","messageId":"20110219163008.GA16117@localhost","threadId":"26559","inReplyTo":null,"subject":"[PATCH] Documentation: default -u is 'normal'","fromName":"Clemens Buchacher","fromEmail":"drizzd@aon.at","sentAt":"2011-02-19T16:30:08Z","receivedAt":"2011-02-19T16:30:08Z","isPatch":true,"sender":{"key":"drizzd@gmx.net","avatar":"https://avatars.githubusercontent.com/u/59082?v=4"},"body":"git-commit's and git-status' default untracked status mode is\n'normal', not 'all'.\n\nSigned-off-by: Clemens Buchacher \n---\n Documentation/git-commit.txt | 2 +-\n Documentation/git-status.txt | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex b586c0f..b4e2f1b 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -214,7 +214,7 @@ FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)\n \n -u[]::\n --untracked-files[=]::\n-\tShow untracked files (Default: 'all').\n+\tShow untracked files (Default: 'normal').\n +\n The mode parameter is optional, and is used to specify\n the handling of untracked files.\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex dae190a..369277a 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -38,7 +38,7 @@ OPTIONS\n \n -u[]::\n --untracked-files[=]::\n-\tShow untracked files (Default: 'all').\n+\tShow untracked files (Default: 'normal').\n +\n The mode parameter is optional, and is used to specify\n the handling of untracked files. The possible options are:\n-- \n1.7.3.1.105.g84915\n"},{"id":"161832","messageId":"7vei71jkdk.fsf@alter.siamese.dyndns.org","threadId":"26559","inReplyTo":"20110219163008.GA16117@localhost","subject":"Re: [PATCH] Documentation: default -u is 'normal'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-02-21T18:46:47Z","receivedAt":"2011-02-21T18:46:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Clemens Buchacher writes:\n\n> git-commit's and git-status' default untracked status mode is\n> 'normal', not 'all'.\n>\n> Signed-off-by: Clemens Buchacher \n\nI wouldn't say there is no problem in this part of the documentation, but\nI think the \"default\" you are touching is not entirely incorrect. It is\ntalking about what happens when you give only -u without saying ,\nand I think _does_ default to 'all'.\n\nWhen the command is _not_ given any \"-u\" option, the behaviour of it does\ndefault to \"handle untracked files in the 'normal'\" mode.\n\n> ...\n> -u[]::\n> --untracked-files[=]::\n> -\tShow untracked files (Default: 'all').\n> +\tShow untracked files (Default: 'normal').\n> +\n> The mode parameter is optional, and is used to specify\n> the handling of untracked files.\n\nSo either\n\n\tShow untracked files ( defaults to 'all')\n\n The mode parameter is optional, and is used to specify the\n handling of untracked files; when -u is not used, the default is\n 'normal', i.e. _show x and y and z_\n\n(I'm too lazy to look x/y/z up, so please fill in the blanks).\n\nor\n\n\tShow untracked files.\n\n The mode parameter is optional (defaults to 'all'), and is used to\n specify the handling of untracked files; when -u is not used, the\n default is 'normal', i.e. _show x and y and z_\n\nI don't have a strong preference either way, but if I had to choose I\nprobably would go with the latter.\n"},{"id":"161837","messageId":"20110221200525.GB31181@localhost","threadId":"26559","inReplyTo":"7vei71jkdk.fsf@alter.siamese.dyndns.org","subject":"[PATCH] Documentation: clarify -u option defaults","fromName":"Clemens Buchacher","fromEmail":"drizzd@aon.at","sentAt":"2011-02-21T20:05:25Z","receivedAt":"2011-02-21T20:05:25Z","isPatch":true,"sender":{"key":"drizzd@gmx.net","avatar":"https://avatars.githubusercontent.com/u/59082?v=4"},"body":"\nSigned-off-by: Clemens Buchacher \n---\n\nHi Junio,\n\nOk, with that we should be able to avoid any future confusion.\nThanks for clarifying.\n\nClemens\n\n Documentation/git-commit.txt | 12 ++++++------\n Documentation/git-status.txt | 16 ++++++++--------\n 2 files changed, 14 insertions(+), 14 deletions(-)\n\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex b586c0f..8f89f6f 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -214,10 +214,11 @@ FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1].)\n \n -u[]::\n --untracked-files[=]::\n-\tShow untracked files (Default: 'all').\n+\tShow untracked files.\n +\n-The mode parameter is optional, and is used to specify\n-the handling of untracked files.\n+The mode parameter is optional (defaults to 'all'), and is used to\n+specify the handling of untracked files; when -u is not used, the\n+default is 'normal', i.e. show untracked files and directories.\n +\n The possible options are:\n +\n@@ -225,9 +226,8 @@ The possible options are:\n \t- 'normal' - Shows untracked files and directories\n \t- 'all' - Also shows individual files in untracked directories.\n +\n-See linkgit:git-config[1] for configuration variable\n-used to change the default for when the option is not\n-specified.\n+The default can be changed using the status.showUntrackedFiles\n+configuration variable documented in linkgit:git-config[1].\n \n -v::\n --verbose::\ndiff --git a/Documentation/git-status.txt b/Documentation/git-status.txt\nindex dae190a..5102a23 100644\n--- a/Documentation/git-status.txt\n+++ b/Documentation/git-status.txt\n@@ -38,20 +38,20 @@ OPTIONS\n \n -u[]::\n --untracked-files[=]::\n-\tShow untracked files (Default: 'all').\n+\tShow untracked files.\n +\n-The mode parameter is optional, and is used to specify\n-the handling of untracked files. The possible options are:\n+The mode parameter is optional (defaults to 'all'), and is used to\n+specify the handling of untracked files; when -u is not used, the\n+default is 'normal', i.e. show untracked files and directories.\n++\n+The possible options are:\n +\n---\n \t- 'no' - Show no untracked files\n \t- 'normal' - Shows untracked files and directories\n \t- 'all' - Also shows individual files in untracked directories.\n---\n +\n-See linkgit:git-config[1] for configuration variable\n-used to change the default for when the option is not\n-specified.\n+The default can be changed using the status.showUntrackedFiles\n+configuration variable documented in linkgit:git-config[1].\n \n --ignore-submodules[=]::\n \tIgnore changes to submodules when looking for changes. can be\n-- \n1.7.3.1.105.g84915\n"}]}