{"thread":{"id":"29056","subject":"mini-wierdness with \"git am\"","startedAt":"2011-11-30T23:12:55Z","lastAt":"2011-12-01T15:38:26Z","messageCount":2,"participants":["Aghiles","Andrew Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"180174","messageId":"CAKCZoVb5-JfzTXK9pUoem_0oQHrSLkrxQZUOZGTX3GGgebPGwA@mail.gmail.com","threadId":"29056","inReplyTo":null,"subject":"mini-wierdness with \"git am\"","fromName":"Aghiles","fromEmail":"aghilesk@gmail.com","sentAt":"2011-11-30T23:12:55Z","receivedAt":"2011-11-30T23:12:55Z","isPatch":false,"sender":{"key":"aghilesk@gmail.com","avatar":null},"body":"Hello,\n\nI am using : git version 1.7.0.3, in Mac OS X.\n\nA slightly strange behavior occurs with \"git am --abort\". Here\nis the sequence:\n\n> git am 000*\nerror: ... : patch doesn not apply\n(oops, forgot to reset)\n> git reset --hard HEAD~1\n> git am 000*\nprevious rebase directory ... still exists but mbox given.\n(oops, forgot to abort)\n> git am --abort\n\nAt this point, my repository is back to ORIG_HEAD!\nMeaning that it reverted my preivous \"git reset --hard HEAD~1\".\n\nHope this is clear.\n\nAs usual, thanks for the great product.\n\n-- aghiles\n"},{"id":"180203","messageId":"4ED79F72.4000003@sohovfx.com","threadId":"29056","inReplyTo":"CAKCZoVb5-JfzTXK9pUoem_0oQHrSLkrxQZUOZGTX3GGgebPGwA@mail.gmail.com","subject":"Re: mini-wierdness with \"git am\"","fromName":"Andrew Wong","fromEmail":"andrew.w@sohovfx.com","sentAt":"2011-12-01T15:38:26Z","receivedAt":"2011-12-01T15:38:26Z","isPatch":false,"sender":{"key":"andrew.w@sohovfx.com","avatar":null},"body":"On 11/30/2011 06:12 PM, Aghiles wrote:\n> At this point, my repository is back to ORIG_HEAD!\n> Meaning that it reverted my preivous \"git reset --hard HEAD~1\".\n>   \n\nThis behavior seems to have been fixed in v1.7.3.5 and later. The new\nbehavior will skip the reverting, and only perform the clean up.\n\nhttp://article.gmane.org/gmane.comp.version-control.git/164045\n"}]}