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

Patrick Ohly patrick.ohly at gmx.de
Thu Jan 14 09:59:22 CET 2010

On Tue, 2010-01-12 at 19:54 +0000, Stephen Kelly wrote:
> The "blocked" commits issue poses bigger problems I think. My knowledge of 
> the internals of git is not strong, but I don't think it would be possible 
> to identify commits to keep only in one branch and not merge with the rest. 

What you could do is a "git merge --no-commit". Then look at all changes
that would be committed and revert those that are not wanted in the
branch that is getting merged into. Commit. The next "git merge" will
only merge changes made since the last merge, so this manual selection
only needs to be done once per patch.

Disclaimer: haven't tried this myself.

Bye, Patrick Ohly
Patrick.Ohly at gmx.de

More information about the Kde-scm-interest mailing list