{"thread":{"id":"31956","subject":"Mistake in git-reset documentation","startedAt":"2012-10-27T11:21:18Z","lastAt":"2012-10-29T05:38:20Z","messageCount":8,"participants":["Bojan Petrović","Krzysztof Mazur","Jeff King","Andreas Schwab"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"202005","messageId":"CABPGWqr7=Rq4qS7yP09t2vMBUJ98NFTSmHUUgMzUQ5=WVrjfqg@mail.gmail.com","threadId":"31956","inReplyTo":null,"subject":"Mistake in git-reset documentation","fromName":"Bojan Petrović","fromEmail":"bojan85@gmail.com","sentAt":"2012-10-27T11:21:18Z","receivedAt":"2012-10-27T11:21:18Z","isPatch":false,"sender":{"key":"bojan85@gmail.com","avatar":null},"body":"None of the three forms of git-reset accept: \"git reset\" which is the\nequivalent of \"git reset -mixed\".\n\nSquare brackets should be used instead of parentheses for \"--soft |\n--mixed | --hard | --merge | --keep\".\n\nBojan\n"},{"id":"202033","messageId":"20121028083610.GA26374@shrek.podlesie.net","threadId":"31956","inReplyTo":"CABPGWqr7=Rq4qS7yP09t2vMBUJ98NFTSmHUUgMzUQ5=WVrjfqg@mail.gmail.com","subject":"Re: Mistake in git-reset documentation","fromName":"Krzysztof Mazur","fromEmail":"krzysiek@podlesie.net","sentAt":"2012-10-28T08:36:10Z","receivedAt":"2012-10-28T08:36:10Z","isPatch":false,"sender":{"key":"krzysiek@podlesie.net","avatar":null},"body":"On Sat, Oct 27, 2012 at 01:21:18PM +0200, Bojan Petrović wrote:\n> None of the three forms of git-reset accept: \"git reset\" which is the\n> equivalent of \"git reset -mixed\".\n> \n> Square brackets should be used instead of parentheses for \"--soft |\n> --mixed | --hard | --merge | --keep\".\n> \n> Bojan\n\nSquare brackets are also missing in \"'git reset' -- []\".\n\nBojan, do you want to add a Reported-by line with your name?\n\nKrzysiek\n\n-- >8 --\nSubject: [PATCH] doc: git-reset: make \"--\" optional\n\nThe git-reset's \"--\" is an optional argument, however it was\ndocumented as required.\n\nSigned-off-by: Krzysztof Mazur \n---\n Documentation/git-reset.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 117e374..1f95292 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -10,7 +10,7 @@ SYNOPSIS\n [verse]\n 'git reset' [-q] [] [--] ...\n 'git reset' (--patch | -p) [] [--] [...]\n-'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] []\n+'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] []\n \n DESCRIPTION\n -----------\n@@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.\n you can use it to selectively reset hunks. See the ``Interactive Mode''\n section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n \n-'git reset' -- []::\n+'git reset' [--] []::\n \tThis form resets the current branch head to and\n \tpossibly updates the index (resetting it to the tree of ) and\n \tthe working tree depending on , which\n-- \n1.8.0.46.gd11dae0\n"},{"id":"202034","messageId":"CABPGWqoA9RKfAT5HPtL8q+cqVnNtY3m62FbnFupDfdNztjOhVA@mail.gmail.com","threadId":"31956","inReplyTo":"20121028083610.GA26374@shrek.podlesie.net","subject":"Re: Mistake in git-reset documentation","fromName":"Bojan Petrović","fromEmail":"bojan85@gmail.com","sentAt":"2012-10-28T09:32:21Z","receivedAt":"2012-10-28T09:32:21Z","isPatch":false,"sender":{"key":"bojan85@gmail.com","avatar":null},"body":"No need for that. Getting this patched will be enough. :) Thank you!\n\nOn 28 October 2012 09:36, Krzysztof Mazur wrote:\n> On Sat, Oct 27, 2012 at 01:21:18PM +0200, Bojan Petrović wrote:\n>> None of the three forms of git-reset accept: \"git reset\" which is the\n>> equivalent of \"git reset -mixed\".\n>>\n>> Square brackets should be used instead of parentheses for \"--soft |\n>> --mixed | --hard | --merge | --keep\".\n>>\n>> Bojan\n>\n> Square brackets are also missing in \"'git reset' -- []\".\n>\n> Bojan, do you want to add a Reported-by line with your name?\n>\n> Krzysiek\n>\n> -- >8 --\n> Subject: [PATCH] doc: git-reset: make \"--\" optional\n>\n> The git-reset's \"--\" is an optional argument, however it was\n> documented as required.\n>\n> Signed-off-by: Krzysztof Mazur \n> ---\n> Documentation/git-reset.txt | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\n> index 117e374..1f95292 100644\n> --- a/Documentation/git-reset.txt\n> +++ b/Documentation/git-reset.txt\n> @@ -10,7 +10,7 @@ SYNOPSIS\n> [verse]\n> 'git reset' [-q] [] [--] ...\n> 'git reset' (--patch | -p) [] [--] [...]\n> -'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] []\n> +'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] []\n>\n> DESCRIPTION\n> -----------\n> @@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.\n> you can use it to selectively reset hunks. See the ``Interactive Mode''\n> section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n>\n> -'git reset' -- []::\n> +'git reset' [--] []::\n> This form resets the current branch head to and\n> possibly updates the index (resetting it to the tree of ) and\n> the working tree depending on , which\n> --\n> 1.8.0.46.gd11dae0\n>\n"},{"id":"202036","messageId":"20121028110715.GB11434@sigill.intra.peff.net","threadId":"31956","inReplyTo":"20121028083610.GA26374@shrek.podlesie.net","subject":"Re: Mistake in git-reset documentation","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-10-28T11:07:15Z","receivedAt":"2012-10-28T11:07:15Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Oct 28, 2012 at 09:36:10AM +0100, Krzysztof Mazur wrote:\n\n> -- >8 --\n> Subject: [PATCH] doc: git-reset: make \"--\" optional\n> \n> The git-reset's \"--\" is an optional argument, however it was\n> documented as required.\n> \n> Signed-off-by: Krzysztof Mazur \n\nI think this is sane, but...\n\n> DESCRIPTION\n> -----------\n> @@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.\n> you can use it to selectively reset hunks. See the ``Interactive Mode''\n> section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n> \n> -'git reset' -- []::\n> +'git reset' [--] []::\n> \tThis form resets the current branch head to and\n> \tpossibly updates the index (resetting it to the tree of ) and\n> \tthe working tree depending on , which\n\nShould we say something like \"if -- is omitted, defaults to\n\"--mixed\"?\n\n-Peff\n"},{"id":"202044","messageId":"m2zk36hg0q.fsf@igel.home","threadId":"31956","inReplyTo":"20121028110715.GB11434@sigill.intra.peff.net","subject":"Re: Mistake in git-reset documentation","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-10-28T13:39:49Z","receivedAt":"2012-10-28T13:39:49Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Jeff King writes:\n\n> On Sun, Oct 28, 2012 at 09:36:10AM +0100, Krzysztof Mazur wrote:\n>\n>> DESCRIPTION\n>> -----------\n>> @@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.\n>> you can use it to selectively reset hunks. See the ``Interactive Mode''\n>> section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n>> \n>> -'git reset' -- []::\n>> +'git reset' [--] []::\n>> \tThis form resets the current branch head to and\n>> \tpossibly updates the index (resetting it to the tree of ) and\n>> \tthe working tree depending on , which\n>\n> Should we say something like \"if -- is omitted, defaults to\n> \"--mixed\"?\n\nUnder --mixed it already says \"This is the default action\", though.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"202045","messageId":"20121028134635.GA25519@sigill.intra.peff.net","threadId":"31956","inReplyTo":"m2zk36hg0q.fsf@igel.home","subject":"Re: Mistake in git-reset documentation","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-10-28T13:46:35Z","receivedAt":"2012-10-28T13:46:35Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Oct 28, 2012 at 02:39:49PM +0100, Andreas Schwab wrote:\n\n> Jeff King writes:\n> \n> > On Sun, Oct 28, 2012 at 09:36:10AM +0100, Krzysztof Mazur wrote:\n> >\n> >> DESCRIPTION\n> >> -----------\n> >> @@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.\n> >> you can use it to selectively reset hunks. See the ``Interactive Mode''\n> >> section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n> >> \n> >> -'git reset' -- []::\n> >> +'git reset' [--] []::\n> >> \tThis form resets the current branch head to and\n> >> \tpossibly updates the index (resetting it to the tree of ) and\n> >> \tthe working tree depending on , which\n> >\n> > Should we say something like \"if -- is omitted, defaults to\n> > \"--mixed\"?\n> \n> Under --mixed it already says \"This is the default action\", though.\n\nI know, but that is somewhat buried for somebody who is seeing that the\n\"--\" bit is optional and wondering what it means to omit it.\n\n-Peff\n"},{"id":"202046","messageId":"20121028141327.GB16686@shrek.podlesie.net","threadId":"31956","inReplyTo":"20121028134635.GA25519@sigill.intra.peff.net","subject":"Re: Mistake in git-reset documentation","fromName":"Krzysztof Mazur","fromEmail":"krzysiek@podlesie.net","sentAt":"2012-10-28T14:13:27Z","receivedAt":"2012-10-28T14:13:27Z","isPatch":false,"sender":{"key":"krzysiek@podlesie.net","avatar":null},"body":"On Sun, Oct 28, 2012 at 09:46:35AM -0400, Jeff King wrote:\n> On Sun, Oct 28, 2012 at 02:39:49PM +0100, Andreas Schwab wrote:\n> \n> > Jeff King writes:\n> > \n> > > On Sun, Oct 28, 2012 at 09:36:10AM +0100, Krzysztof Mazur wrote:\n> > >\n> > >> DESCRIPTION\n> > >> -----------\n> > >> @@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.\n> > >> you can use it to selectively reset hunks. See the ``Interactive Mode''\n> > >> section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n> > >> \n> > >> -'git reset' -- []::\n> > >> +'git reset' [--] []::\n> > >> \tThis form resets the current branch head to and\n> > >> \tpossibly updates the index (resetting it to the tree of ) and\n> > >> \tthe working tree depending on , which\n> > >\n> > > Should we say something like \"if -- is omitted, defaults to\n> > > \"--mixed\"?\n> > \n> > Under --mixed it already says \"This is the default action\", though.\n> \n> I know, but that is somewhat buried for somebody who is seeing that the\n> \"--\" bit is optional and wondering what it means to omit it.\n> \n\nThe --mixed mode is also described as second mode, and saying that --mixed\nis default earlier may save some time wasted on reading --soft\ndescription.\n\nThere is also small inconsequence in what is, just \"mixed\" or\n\"--mixed\".\n\nKrzysiek\n\n-- >8 --\nSubject: [PATCH] doc: git-reset: make \"\" optional\n\nThe git-reset's \"\" is an optional argument, however it was\ndocumented as required.\n\nThe \"\" is documented as one of: --soft, --mixed, --hard, --merge\nor --keep, so \"\" should be used instead of \"--\".\n\nSigned-off-by: Krzysztof Mazur \n---\n Documentation/git-reset.txt | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 117e374..978d8da 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -10,7 +10,7 @@ SYNOPSIS\n [verse]\n 'git reset' [-q] [] [--] ...\n 'git reset' (--patch | -p) [] [--] [...]\n-'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] []\n+'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] []\n \n DESCRIPTION\n -----------\n@@ -43,11 +43,11 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.\n you can use it to selectively reset hunks. See the ``Interactive Mode''\n section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n \n-'git reset' -- []::\n+'git reset' [] []::\n \tThis form resets the current branch head to and\n \tpossibly updates the index (resetting it to the tree of ) and\n-\tthe working tree depending on , which\n-\tmust be one of the following:\n+\tthe working tree depending on . If is omitted,\n+\tdefaults to \"--mixed\". The must be one of the following:\n +\n --\n --soft::\n-- \n1.8.0.47.g5b520ba\n"},{"id":"202084","messageId":"20121029053820.GC30186@sigill.intra.peff.net","threadId":"31956","inReplyTo":"20121028141327.GB16686@shrek.podlesie.net","subject":"Re: Mistake in git-reset documentation","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-10-29T05:38:20Z","receivedAt":"2012-10-29T05:38:20Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Oct 28, 2012 at 03:13:27PM +0100, Krzysztof Mazur wrote:\n\n> The --mixed mode is also described as second mode, and saying that --mixed\n> is default earlier may save some time wasted on reading --soft\n> description.\n> \n> There is also small inconsequence in what is, just \"mixed\" or\n> \"--mixed\".\n\nYeah, agreed on both.\n\n> -- >8 --\n> Subject: [PATCH] doc: git-reset: make \"\" optional\n> \n> The git-reset's \"\" is an optional argument, however it was\n> documented as required.\n> \n> The \"\" is documented as one of: --soft, --mixed, --hard, --merge\n> or --keep, so \"\" should be used instead of \"--\".\n> \n> Signed-off-by: Krzysztof Mazur \n\nThanks, this looks good to me.\n\n-Peff\n"}]}