{"thread":{"id":"17424","subject":"git reset --merge misdocumented?","startedAt":"2009-01-29T01:17:44Z","lastAt":"2009-01-30T23:20:18Z","messageCount":2,"participants":["Johannes Schindelin","Thomas Rast"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"102378","messageId":"alpine.DEB.1.00.0901290210540.3586@pacific.mpi-cbg.de","threadId":"17424","inReplyTo":null,"subject":"git reset --merge misdocumented?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-01-29T01:17:44Z","receivedAt":"2009-01-29T01:17:44Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nfrom the man page I thought that --merge would be just another way to say \n\"git read-tree -u -m\".\n\nIn particular, the man page says _nothing_ about resetting HEAD to \nsomething else.\n\nMaybe somebody with l33ter dox skillz than me would like to fix that.\n\nCiao,\nDscho\n"},{"id":"102658","messageId":"200901310020.23851.trast@student.ethz.ch","threadId":"17424","inReplyTo":"alpine.DEB.1.00.0901290210540.3586@pacific.mpi-cbg.de","subject":"Re: git reset --merge misdocumented?","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2009-01-30T23:20:18Z","receivedAt":"2009-01-30T23:20:18Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Johannes Schindelin wrote:\n> from the man page I thought that --merge would be just another way to say \n> \"git read-tree -u -m\".\n\nIsn't that idea from the commit message?  I can't find any mention of\nread-tree in next's idea of the manpage.\n\n> In particular, the man page says _nothing_ about resetting HEAD to \n> something else.\n\nIt says\n\n  --merge::\n          Resets the index to match the tree recorded by the named commit,\n          and updates the files that are different between the named commit\n          and the current commit in the working tree.\n\nso while the exact way of \"updating\" is not specified, it does mention\nthat you can move between commits, and that it will do something with\nthe difference across the move.\n\nThe example further down really cleared up the idea for me:\n\n  Undo a merge or pull inside a dirty work tree::\n  +\n  ------------\n  $ git pull                         <1>\n  Auto-merging nitfol\n  Merge made by recursive.\n   nitfol                |   20 +++++----\n   ...\n  $ git reset --merge ORIG_HEAD      <2>\n  ------------\n\nI've never used 'read-tree -u -m' except in voodoo scripting, but I'd\nhave done the same with 'git stash && git reset --hard ORIG_HEAD &&\ngit stash pop' before.  The original commit message even mentions this\nequivalence.\n\nSo I'm not sure what exactly needs changing there?\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"}]}