Re: Git repository

2008-09-09 Thread Stephen R. van den Berg
Henrik Grubbstr?m (Lysator) @ Pike (-) developers forum wrote: The recommended practice is that for back/forwardports the commit id's of the originating cherry-picked patches are mentioned at the bottom of the new commit message. Unfortunately that won't help (if we) in the future use git for

Re: Git repository

2008-09-09 Thread Martin Stjernholm, Roxen IS @ Pike developers forum
Correct. And apparently it was/is intended for merges only, even though the diff-machinery already delivers correct results even if it's a cherry-pick instead of a merge. Does it? That's also a thing that confuses me: Consider commit 1cc21ef0320ecb734d4db5b85dbdc0406815e38e, which is a

Re: Git repository

2008-09-09 Thread Martin Bähr
On Tue, Sep 09, 2008 at 04:45:02PM +, Martin Stjernholm, Roxen IS @ Pike developers forum wrote: Btw, speaking of git-log, how does one make it print out the branches like gitk does? i think you are looking for --decorate Print out the ref names of any commits that

Re: Git repository

2008-09-09 Thread Martin Stjernholm, Roxen IS @ Pike developers forum
--decorate helps a bit, but it still doesn't show the branch(es) each commit is made on. Thanks for the tip anyway.