[Kde-scm-interest] Git and the needs of KDE PIM

[Oswald Buddenhagen]

On Sun, Jan 17, 2010 at 03:39:10PM +0100, Cornelius wrote:
> Am 17.01.2010 12:07, schrieb Riccardo Iaconelli:
> > On Sunday 17 January 2010 00:03:43 Oswald Buddenhagen wrote:
> >>   but git doesn't have an svnmerge tool to keep track of
> >> cherry-picked and even more blacklisted commits ...
> >
> > I'm not 100% sure, but i noticed that if you try to merge a branch with
> > cherry-picked commits git will notice and will work well with them, without
> > causing conflicts.
> >
> > But, if you mean getting back a human-readable list of cherry-picked commits,
> > yeah, there's no way to get it out of git.
>
> git cherry?
>
git log --cherry-pick foo...bar
- depending on what you want ...

> But okay, it just works when the patches you cherry-picked were not 
> modified...
>
yes, and the same goes for the merging itself, i.e., modifications on
top of cherry-picks yield conflicts.
not to mention that after merging you have both the original and the
cherry-picked commit in the history. that's why i would not recommend
merging any branches which were created before the git-ification.