{"thread":{"id":"15755","subject":"update-index --unresolve","startedAt":"2008-10-02T13:52:25Z","lastAt":"2008-10-02T14:25:03Z","messageCount":4,"participants":["SZEDER Gábor","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"92153","messageId":"20081002135224.GC6839@neumann","threadId":"15755","inReplyTo":null,"subject":"update-index --unresolve","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2008-10-02T13:52:25Z","receivedAt":"2008-10-02T13:52:25Z","isPatch":false,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Dear All,\n\nthe documentation says following:\n\n  --unresolve::\n         Restores the 'unmerged' or 'needs updating' state of a\n         file during a merge if it was cleared by accident.\n\nHow could I clear those states by accident (or intentionally)?\n\nThanks,\nGábor\n"},{"id":"92156","messageId":"m3tzbvqesz.fsf@localhost.localdomain","threadId":"15755","inReplyTo":"20081002135224.GC6839@neumann","subject":"Re: update-index --unresolve","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-10-02T13:58:41Z","receivedAt":"2008-10-02T13:58:41Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"SZEDER Gábor <szeder@ira.uka.de> writes:\n\n> Dear All,\n> \n> the documentation says following:\n> \n>   --unresolve::\n>          Restores the 'unmerged' or 'needs updating' state of a\n>          file during a merge if it was cleared by accident.\n> \n> How could I clear those states by accident (or intentionally)?\n\n\"git add <file>\", or \"git update-index <file>\", or error in handling\nmerge tool via git-mergetool.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"92162","messageId":"20081002141853.GD6839@neumann","threadId":"15755","inReplyTo":"m3tzbvqesz.fsf@localhost.localdomain","subject":"Re: update-index --unresolve","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2008-10-02T14:18:53Z","receivedAt":"2008-10-02T14:18:53Z","isPatch":false,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Hi Jakub,\n\nOn Thu, Oct 02, 2008 at 06:58:41AM -0700, Jakub Narebski wrote:\n> SZEDER Gábor <szeder@ira.uka.de> writes:\n> >   --unresolve::\n> >          Restores the 'unmerged' or 'needs updating' state of a\n> >          file during a merge if it was cleared by accident.\n> > \n> > How could I clear those states by accident (or intentionally)?\n> \n> \"git add <file>\", or \"git update-index <file>\", or error in handling\n> merge tool via git-mergetool.\nThanks for your fast reply.\n\nHowever:\n\n# ...  do a conflicting merge\n(master|MERGING)$ echo 4 >one\n(master|MERGING)$ git status\none: needs merge\n# On branch master\n# Changed but not updated:\n#   (use \"git add <file>...\" to update what will be committed)\n#   (use \"git checkout -- <file>...\" to discard changes in working\n#   directory)\n#\n#       unmerged:   one\n#\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n(master|MERGING)$ git add one\n(master|MERGING)$ git status\n# On branch master\n# Changes to be committed:\n#   (use \"git reset HEAD <file>...\" to unstage)\n#\n#       modified:   one\n#\n(master|MERGING)$ git update-index --unresolve\n(master|MERGING)$ echo $?\n0\n(master|MERGING)$ git status\n# On branch master\n# Changes to be committed:\n#   (use \"git reset HEAD <file>...\" to unstage)\n#\n#       modified:   one\n#\n\nSo, as you can see, after 'add ; update-index --unresolve' the file is\nnot marked as unmerged, but it's still ready to be committed.\n\nIs something wrong going on here, or it is indeed the intended\nbehaviour and I misunderstood this functionality?\n\nThanks,\nGábor\n"},{"id":"92164","messageId":"20081002142503.GE6839@neumann","threadId":"15755","inReplyTo":"20081002141853.GD6839@neumann","subject":"Re: update-index --unresolve","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2008-10-02T14:25:03Z","receivedAt":"2008-10-02T14:25:03Z","isPatch":false,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"On Thu, Oct 02, 2008 at 04:18:53PM +0200, SZEDER Gábor wrote:\n> > > How could I clear those states by accident (or intentionally)?\n> > \n> > \"git add <file>\", or \"git update-index <file>\", or error in handling\n> > merge tool via git-mergetool.\n> Thanks for your fast reply.\n> \n> However:\n> \n> # ...  do a conflicting merge\n> (master|MERGING)$ echo 4 >one\n> (master|MERGING)$ git status\n> one: needs merge\n> # On branch master\n> # Changed but not updated:\n> #   (use \"git add <file>...\" to update what will be committed)\n> #   (use \"git checkout -- <file>...\" to discard changes in working\n> #   directory)\n> #\n> #       unmerged:   one\n> #\n> no changes added to commit (use \"git add\" and/or \"git commit -a\")\n> (master|MERGING)$ git add one\n> (master|MERGING)$ git status\n> # On branch master\n> # Changes to be committed:\n> #   (use \"git reset HEAD <file>...\" to unstage)\n> #\n> #       modified:   one\n> #\n> (master|MERGING)$ git update-index --unresolve\n\nAh, that should be 'git update-index --unresolve one', and\neverything works as expected.\n\n\nSorry,\nGábor\n"}]}