{"thread":{"id":"29006","subject":"git reset --merge documentation improvments","startedAt":"2011-11-23T08:31:06Z","lastAt":"2011-11-23T11:39:39Z","messageCount":3,"participants":["Philippe Vaucher","Vincent van Ravesteijn"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"179864","messageId":"CAGK7Mr59bN8rjhLHAK0Vq=bOBBHG=N02CgGe-np=OBdTyS+rsA@mail.gmail.com","threadId":"29006","inReplyTo":null,"subject":"git reset --merge documentation improvments","fromName":"Philippe Vaucher","fromEmail":"philippe.vaucher@gmail.com","sentAt":"2011-11-23T08:31:06Z","receivedAt":"2011-11-23T08:31:06Z","isPatch":false,"sender":{"key":"philippe.vaucher@gmail.com","avatar":null},"body":"Hello,\n\nThe current documentation for --merge is:\n\n\"Resets the index [1] and updates the files in the working tree that\nare different between <commit> and HEAD, but keeps those which are\ndifferent between the index [2] and working tree\"\n\nI think this is confusing, because [1] is the *after-reset* index and\n[2] is the *before-reset* index. If you fail to realise this it looks\nlike this \"resets index (so index is empty) and then updates worktree\nbut skip files staged from index\" --> \"but there's nothing staged, the\nindex was reset!\"\n\nI think a better sentence would be:\n\n\"Updates the files in the working tree that are different between\n<commit> and HEAD, but keeps those which are different between the\nindex and working tree, and finally resets the index.\"\n\nOr something along those lines.\n\nPhilippe\n"},{"id":"179868","messageId":"4ECCB565.9020706@lyx.org","threadId":"29006","inReplyTo":"CAGK7Mr59bN8rjhLHAK0Vq=bOBBHG=N02CgGe-np=OBdTyS+rsA@mail.gmail.com","subject":"Re: git reset --merge documentation improvments","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2011-11-23T08:57:09Z","receivedAt":"2011-11-23T08:57:09Z","isPatch":false,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"Op 23-11-2011 9:31, Philippe Vaucher schreef:\n> Hello,\n>\n> The current documentation for --merge is:\n>\n> \"Resets the index [1] and updates the files in the working tree that\n> are different between<commit>  and HEAD, but keeps those which are\n> different between the index [2] and working tree\"\n>\n> I think this is confusing, because [1] is the *after-reset* index and\n> [2] is the *before-reset* index.\n\nYou mean that you read that the *after-reset* index is reset ? They both \nrefer to the *before-reset* index.\n\n>   If you fail to realise this it looks\n> like this \"resets index (so index is empty) and then updates worktree\n> but skip files staged from index\" -->  \"but there's nothing staged, the\n> index was reset!\"\n\nThe misunderstanding comes from the added \"then\".\n\n>\n> I think a better sentence would be:\n>\n> \"Updates the files in the working tree that are different between\n> <commit>  and HEAD, but keeps those which are different between the\n> index and working tree, and finally resets the index.\"\n\nThere is nothing to update as long as the index is not reset.\n\nVincent\n"},{"id":"179878","messageId":"CAGK7Mr4UGc3jx2AQpRK_sotWHU-ibmGz87jx4hi-==8qY04QOg@mail.gmail.com","threadId":"29006","inReplyTo":"4ECCB565.9020706@lyx.org","subject":"Re: git reset --merge documentation improvments","fromName":"Philippe Vaucher","fromEmail":"philippe.vaucher@gmail.com","sentAt":"2011-11-23T11:39:39Z","receivedAt":"2011-11-23T11:39:39Z","isPatch":false,"sender":{"key":"philippe.vaucher@gmail.com","avatar":null},"body":">> \"Updates the files in the working tree that are different between\n>> <commit>  and HEAD, but keeps those which are different between the\n>> index and working tree, and finally resets the index.\"\n>\n> There is nothing to update as long as the index is not reset.\n\nWell then I simply don't understand what --merge does. Is it like\n--keep but instead of failing when a file-to-be-overwritten has\nchanges it simply ignores the overwriting and continues?\n\nPhilippe\n"}]}