{"thread":{"id":"1578","subject":"RE: git-whatchanged -p anomoly?","startedAt":"2005-08-18T22:44:03Z","lastAt":"2005-08-18T23:47:05Z","messageCount":3,"participants":["Luck, Tony","Linus Torvalds","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7525","messageId":"B8E391BBE9FE384DAA4C5C003888BE6F042C819D@scsmsx401.amr.corp.intel.com","threadId":"1578","inReplyTo":null,"subject":"RE: git-whatchanged -p anomoly?","fromName":"Luck, Tony","fromEmail":"tony.luck@intel.com","sentAt":"2005-08-18T22:44:03Z","receivedAt":"2005-08-18T22:44:03Z","isPatch":false,"sender":{"key":"tony.luck@intel.com","avatar":"https://avatars.githubusercontent.com/u/5446021?v=4"},"body":"\n>Now, I suspect you didn't mean to commit that thing: it really looks like \n>you've mixed up your patches somehow, because the commit message seems to \n>match only a very small portion of the patch.\n>\n>Did you perhaps have a failed merge or something that was in your index \n>when you applied that patch? If you have a dirty index when you do \n>\"git-applymbox\", it the commit done as part of the applymbox might commit \n>other state too.\n\nYes I had a failed merge ... I thought that I had cleaned up from it, but\nclearly I hadn't.  Bother.\n\nI guess I have a bit of tree maintenance to do ... But I think that it\nshould be easy ... I can just step \"test\" back to before I merged in\nthe Alex patch.  Redo the Alex patch properly.  Then re-merge all the\nbranches that happened after this.  Followed by crossing my fingers and\nrunning \"git prune\".\n\nMaybe I'll try all that in a *copy\" of my GIT tree first!\n\n-Tony\n"},{"id":"7526","messageId":"Pine.LNX.4.58.0508181555370.3412@g5.osdl.org","threadId":"1578","inReplyTo":"B8E391BBE9FE384DAA4C5C003888BE6F042C819D@scsmsx401.amr.corp.intel.com","subject":"RE: git-whatchanged -p anomoly?","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2005-08-18T23:04:27Z","receivedAt":"2005-08-18T23:04:27Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Thu, 18 Aug 2005, Luck, Tony wrote:\n> \n> Yes I had a failed merge ... I thought that I had cleaned up from it, but\n> clearly I hadn't.  Bother.\n\nThe simplest way of cleaning up after a failed merge is just a simple \"git\nreset\", which will also tell you if you need to perhaps clean up\nafterwards (equally easily done with \"git checkout -f\" if you just want to \nblow all the changes away.\n\n> I guess I have a bit of tree maintenance to do ... But I think that it\n> should be easy ... I can just step \"test\" back to before I merged in\n> the Alex patch.  Redo the Alex patch properly.  Then re-merge all the\n> branches that happened after this.  Followed by crossing my fingers and\n> running \"git prune\".\n> \n> Maybe I'll try all that in a *copy\" of my GIT tree first!\n\nYup. Think of it as a good exercise in git ;)\n\nBtw, it's a shame that git has all these \"git rebase\" etc helper scripts, \nwhich rebase whole series of patches, but the simple \"git re-do\" which \nbasically ends up being a\n\n\tgit-diff-tree -p $old | git-apply --index &&\n\t\tgit commit --reedit=$old\n\ndoesn't have a nice helper script.\n\nAnyway, the easiest approach may be to just do\n\n\tgit branch new-test-branch <good-point>\n\tgit format-patch -o patchdir --mbox <good-point>\n\tgit checkout new-test-branch\n\t.. edit the individual patches in patchdir/* to taste ..\n\tcat git-applymbox patchdir/* | git-applymbox\n\nor similar. \n\n\t\tLinus\n"},{"id":"7527","messageId":"Pine.LNX.4.63.0508190146150.8295@wgmdd8.biozentrum.uni-wuerzburg.de","threadId":"1578","inReplyTo":"Pine.LNX.4.58.0508181555370.3412@g5.osdl.org","subject":"RE: git-whatchanged -p anomoly?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-08-18T23:47:05Z","receivedAt":"2005-08-18T23:47:05Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 18 Aug 2005, Linus Torvalds wrote:\n\n> Btw, it's a shame that git has all these \"git rebase\" etc helper scripts, \n> which rebase whole series of patches, but the simple \"git re-do\" which \n> basically ends up being a\n> \n> \tgit-diff-tree -p $old | git-apply --index &&\n> \t\tgit commit --reedit=$old\n\nHow about \"git-cherry-pick-script\"? Junio?\n\nCiao,\nDscho\n"}]}