{"thread":{"id":"18173","subject":"marking (cherry-pick) commits ?","startedAt":"2009-03-06T14:41:25Z","lastAt":"2009-03-06T14:41:25Z","messageCount":1,"participants":["Marc Weber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"107204","messageId":"20090306144125.GA14569@gmx.de","threadId":"18173","inReplyTo":null,"subject":"marking (cherry-pick) commits ?","fromName":"Marc Weber","fromEmail":"marco-oweber@gmx.de","sentAt":"2009-03-06T14:41:25Z","receivedAt":"2009-03-06T14:41:25Z","isPatch":false,"sender":{"key":"marco-oweber@gmx.de","avatar":null},"body":"I've this situation:\n\nbase --------- branch_A (svn trunk)\n  ` ---------- branch_B (svn branch )\n\nSome cherry picks have been done both dirctions.\nIs there a way show gitk branch_A branch_B and mark cherry-picks?\nI only know about --left-right --cherry-pick and such omitting them.\n\nHow does --cherry-pick work? Is it based on git-commit-id?\nProbably it would be enough to write a simple script iterating over both\nbrnaches adding some temporary tags pointing out the pairs of\ncherry-picked patches..\n\nIs there another way \"marking\" patches?\nMaybe it would be fun to use \n\ngit tab tmp_dont_commit_red_message\ngit tab tmp_dont_commit_green_message\n\nand ask gitk to show them in red and green?\n\nCan I tell git push to not push all tags starting with tmp_dont_commit_\n?\n\nThere are only about 120 patches.. So I can manually handle that case..\nBut I guess git can do better.\n\nSincerly\nMarc Weber\n"}]}