{"thread":{"id":"34780","subject":"[PATCH] documentation: clarify notes for clean.requireForce","startedAt":"2013-08-27T14:11:29Z","lastAt":"2013-08-28T01:28:32Z","messageCount":3,"participants":["Jiang Xin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"225993","messageId":"07b4019b473c2e6d46e75b5ae5ce3f431e4e74d0.1377612590.git.worldhello.net@gmail.com","threadId":"34780","inReplyTo":null,"subject":"[PATCH] documentation: clarify notes for clean.requireForce","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2013-08-27T14:11:29Z","receivedAt":"2013-08-27T14:11:29Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Add \"-i\" (interactive clean option) to clarify the documentation for\n\"clean.requireForce\" config variable. Also replace the example in\n`gitcli.txt` with safer git clean command.\n\nSigned-off-by: Jiang Xin \n---\n Documentation/config.txt | 4 ++--\n Documentation/gitcli.txt | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 8361380..547149d 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -795,8 +795,8 @@ browser..path::\n \tworking repository in gitweb (see linkgit:git-instaweb[1]).\n \n clean.requireForce::\n-\tA boolean to make git-clean do nothing unless given -f\n-\tor -n. Defaults to true.\n+\tA boolean to make git-clean do nothing unless given -i,\n+\t-f or -n. Defaults to true.\n \n color.branch::\n \tA boolean to enable/disable color in the output of\ndiff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\nindex 9ac5088..4005a3b 100644\n--- a/Documentation/gitcli.txt\n+++ b/Documentation/gitcli.txt\n@@ -135,7 +135,7 @@ Aggregating short options\n ~~~~~~~~~~~~~~~~~~~~~~~~~\n Commands that support the enhanced option parser allow you to aggregate short\n options. This means that you can for example use `git rm -rf` or\n-`git clean -fdx`.\n+`git clean -idx`.\n \n \n Abbreviating long options\n-- \n1.8.4.rc3.2.gf223459\n"},{"id":"226014","messageId":"xmqqd2ozdrie.fsf@gitster.dls.corp.google.com","threadId":"34780","inReplyTo":"07b4019b473c2e6d46e75b5ae5ce3f431e4e74d0.1377612590.git.worldhello.net@gmail.com","subject":"Re: [PATCH] documentation: clarify notes for clean.requireForce","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-27T16:31:53Z","receivedAt":"2013-08-27T16:31:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jiang Xin writes:\n\n> Add \"-i\" (interactive clean option) to clarify the documentation for\n> \"clean.requireForce\" config variable. Also replace the example in\n> `gitcli.txt` with safer git clean command.\n\nHmm, the former change may make sense, but I am not sure about the\nlatter. The section is about showing examples of concatenating\ncommand line options, and I find it far more appropriate to use\n\"clean -f\", which is a lot more widely known than \"clean -i\", for\nthe intended audience, those who are learning how to compose the\ncommand line options.\n\n> Signed-off-by: Jiang Xin \n> ---\n> Documentation/config.txt | 4 ++--\n> Documentation/gitcli.txt | 2 +-\n> 2 files changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/config.txt b/Documentation/config.txt\n> index 8361380..547149d 100644\n> --- a/Documentation/config.txt\n> +++ b/Documentation/config.txt\n> @@ -795,8 +795,8 @@ browser..path::\n> \tworking repository in gitweb (see linkgit:git-instaweb[1]).\n> \n> clean.requireForce::\n> -\tA boolean to make git-clean do nothing unless given -f\n> -\tor -n. Defaults to true.\n> +\tA boolean to make git-clean do nothing unless given -i,\n> +\t-f or -n. Defaults to true.\n> \n> color.branch::\n> \tA boolean to enable/disable color in the output of\n> diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt\n> index 9ac5088..4005a3b 100644\n> --- a/Documentation/gitcli.txt\n> +++ b/Documentation/gitcli.txt\n> @@ -135,7 +135,7 @@ Aggregating short options\n> ~~~~~~~~~~~~~~~~~~~~~~~~~\n> Commands that support the enhanced option parser allow you to aggregate short\n> options. This means that you can for example use `git rm -rf` or\n> -`git clean -fdx`.\n> +`git clean -idx`.\n> \n> \n> Abbreviating long options\n"},{"id":"226074","messageId":"0ac7e5f803a34f417e320df35aaec793a5b980c6.1377653235.git.worldhello.net@gmail.com","threadId":"34780","inReplyTo":"xmqqd2ozdrie.fsf@gitster.dls.corp.google.com","subject":"[PATCH v2] documentation: clarify notes for clean.requireForce","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2013-08-28T01:28:32Z","receivedAt":"2013-08-28T01:28:32Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Add \"-i\" (interactive clean option) to clarify the documentation for\n\"clean.requireForce\" config variable.\n\nSigned-off-by: Jiang Xin \n---\n Documentation/config.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 8361380..7321a54 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -795,8 +795,8 @@ browser..path::\n \tworking repository in gitweb (see linkgit:git-instaweb[1]).\n \n clean.requireForce::\n-\tA boolean to make git-clean do nothing unless given -f\n-\tor -n. Defaults to true.\n+\tA boolean to make git-clean do nothing unless given -f,\n+\t-i or -n. Defaults to true.\n \n color.branch::\n \tA boolean to enable/disable color in the output of\n-- \n1.8.3.rc2.29.g07b4019\n"}]}