{"thread":{"id":"28204","subject":"[PATCH] git-reset.txt: Be clearer about the symbolic ref nature of HEAD","startedAt":"2011-08-24T09:56:26Z","lastAt":"2011-08-24T11:34:58Z","messageCount":2,"participants":["Michael J Gruber","Drew Northup"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"174143","messageId":"f903e0bb1c14cb083c263deb165dc9495ab4c60e.1314179720.git.git@drmicha.warpmail.net","threadId":"28204","inReplyTo":null,"subject":"[PATCH] git-reset.txt: Be clearer about the symbolic ref nature of HEAD","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-08-24T09:56:26Z","receivedAt":"2011-08-24T09:56:26Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"\"git reset\" updates the ref which HEAD points to (or HEAD itself, if\ndetached), due to being a symbolic ref (unless detached). Therefore,\n\"updating/resetting HEAD\" is a possible source of confusion especially when\ncompared with \"git checkout\", and the change in\nd537c74 (git-reset.txt: make modes description more consistent, 2010-09-15)\ndid not quite help.\n\nClean up after d537c74 (myself) and try to be even clearer about which\nref is changed by \"git reset\". Avoid the term \"symbolic ref\", because who can\ntell *HEAD from HEAD from &HEAD?\n\nSigned-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n---\n Documentation/git-reset.txt |    7 ++++---\n 1 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex b2832fc..96c964d 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -15,7 +15,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n In the first and second form, copy entries from <commit> to the index.\n-In the third form, set the current branch head (HEAD) to <commit>, optionally\n+In the third form, set the current branch head (which HEAD points to) to <commit>, optionally\n modifying index and working tree to match.  The <commit> defaults to HEAD\n in all forms.\n \n@@ -44,8 +44,9 @@ 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' [--<mode>] [<commit>]::\n-\tThis form resets the current branch head to <commit> and\n-\tpossibly updates the index (resetting it to the tree of <commit>) and\n+\tThis form resets the current branch head (which HEAD points to) to <commit>;\n+\tif HEAD points to a commit (aka detached HEAD) then HEAD is reset to <commit>.\n+\tThis form also possibly updates the index (resetting it to the tree of <commit>) and\n \tthe working tree depending on <mode>, which\n \tmust be one of the following:\n +\n-- \n1.7.6.845.gc3c05\n"},{"id":"174148","messageId":"1314185698.13674.8.camel@drew-northup.unet.maine.edu","threadId":"28204","inReplyTo":"f903e0bb1c14cb083c263deb165dc9495ab4c60e.1314179720.git.git@drmicha.warpmail.net","subject":"Re: [PATCH] git-reset.txt: Be clearer about the symbolic ref nature of HEAD","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2011-08-24T11:34:58Z","receivedAt":"2011-08-24T11:34:58Z","isPatch":true,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"\nOn Wed, 2011-08-24 at 11:56 +0200, Michael J Gruber wrote:\n> \"git reset\" updates the ref which HEAD points to (or HEAD itself, if\n> detached), due to being a symbolic ref (unless detached). Therefore,\n> \"updating/resetting HEAD\" is a possible source of confusion especially when\n> compared with \"git checkout\", and the change in\n> d537c74 (git-reset.txt: make modes description more consistent, 2010-09-15)\n> did not quite help.\n> \n> Clean up after d537c74 (myself) and try to be even clearer about which\n> ref is changed by \"git reset\". Avoid the term \"symbolic ref\", because who can\n> tell *HEAD from HEAD from &HEAD?\n> \n> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>\n> ---\n\nLooks reasonable to me.\n\n>  Documentation/git-reset.txt |    7 ++++---\n>  1 files changed, 4 insertions(+), 3 deletions(-)\n> \n> diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\n> index b2832fc..96c964d 100644\n> --- a/Documentation/git-reset.txt\n> +++ b/Documentation/git-reset.txt\n> @@ -15,7 +15,7 @@ SYNOPSIS\n>  DESCRIPTION\n>  -----------\n>  In the first and second form, copy entries from <commit> to the index.\n> -In the third form, set the current branch head (HEAD) to <commit>, optionally\n> +In the third form, set the current branch head (which HEAD points to) to <commit>, optionally\n>  modifying index and working tree to match.  The <commit> defaults to HEAD\n>  in all forms.\n>  \n> @@ -44,8 +44,9 @@ 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' [--<mode>] [<commit>]::\n> -\tThis form resets the current branch head to <commit> and\n> -\tpossibly updates the index (resetting it to the tree of <commit>) and\n> +\tThis form resets the current branch head (which HEAD points to) to <commit>;\n> +\tif HEAD points to a commit (aka detached HEAD) then HEAD is reset to <commit>.\n> +\tThis form also possibly updates the index (resetting it to the tree of <commit>) and\n>  \tthe working tree depending on <mode>, which\n>  \tmust be one of the following:\n>  +\n-- \n-Drew Northup\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"}]}