{"thread":{"id":"43442","subject":"Re: git reset --soft a merged commit","startedAt":"2006-11-06T04:48:49Z","lastAt":"2006-11-06T09:01:44Z","messageCount":3,"participants":["Shawn Pearce","Nguyen Thai Ngoc Duy","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"295408","messageId":"fcaeb9bf0611052048r11816e76p88d568e3478c354b@mail.gmail.com","threadId":"43442","inReplyTo":null,"subject":"git reset --soft a merged commit","fromName":"Nguyen Thai Ngoc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2006-11-06T04:48:49Z","receivedAt":"2006-11-06T04:48:49Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Hi,\nI did \"git reset --soft HEAD~1\" where HEAD is a merged commit and\ncommitted again (nothing changed).  The new commit was not recorded as\na merged commit. Is it intentional?\n\n-- \n"},{"id":"294799","messageId":"20061106045038.GA22985@spearce.org","threadId":"43442","inReplyTo":"fcaeb9bf0611052048r11816e76p88d568e3478c354b@mail.gmail.com","subject":"Re: git reset --soft a merged commit","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-11-06T04:50:38Z","receivedAt":"2006-11-06T04:50:38Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:\n> Hi,\n> I did \"git reset --soft HEAD~1\" where HEAD is a merged commit and\n> committed again (nothing changed).  The new commit was not recorded as\n> a merged commit. Is it intentional?\n\nYes, you undid the merge.  :-(\n\n-- \n"},{"id":"296500","messageId":"eimtkj$bkv$1@sea.gmane.org","threadId":"43442","inReplyTo":"fcaeb9bf0611052048r11816e76p88d568e3478c354b@mail.gmail.com","subject":"Re: git reset --soft a merged commit","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-11-06T09:01:44Z","receivedAt":"2006-11-06T09:01:44Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Nguyen Thai Ngoc Duy wrote:\n\n> I did \"git reset --soft HEAD~1\" where HEAD is a merged commit and\n> committed again (nothing changed).  The new commit was not recorded as\n> a merged commit. Is it intentional?\n\nYes, you have chosen to go back to 1st parent. The information about other\nparents got lost.\n\nIf you want to correct commit, even if it is merge commit, use\n  git commit --amend\ninstead.\n\nOr you can muck with MERGE_HEAD instead.\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n\n"}]}