Re: two git-cherry-pick enhancements

From: Sitaram Chamarty <sitaramc@gmail.com>
Date: May 22, 2008, 08:58 UTC
Message-ID: <2e24e5b90805220158n5c31da1yf98cac8b432a2d9d@mail.gmail.com>
In-Reply-To: <20080521163817.GA13124@denkbrett.schottelius.org>

On Wed, May 21, 2008 at 10:08 PM, Nico -telmich- Schottelius <nico-git-20080521@schottelius.org> wrote:

Show 8 quoted lines

> - Apply only parts of the patch which applies to <file ...>:
>   I sometimes want to apply patches only to some, but not all
>   files the patch introduces
>
> - Interactively selecting which parts to apply:
>   I want only 7 out of 10 changes the patch introduces.
>   It would help alot, if I could choose which parts I want
>   to apply for every part of the patch.

Both of these are (often, though not always) signs that commits are not granular enough. Your branch maintainer or developer has combined unrelated things into one commit. In an ideal world, he would put each piece as a separate commit, such that if you pick one of those apart, it doesn't make sense.

This is also usually a sign of someone using a central VCS model (or mental model) on that side.

Unless you have no control over who sends you these commits, you may want to address that also in whatever way possible.

IMO stuff like "git add -a" (and the GUI equivalents) were meant for your own development, so that you can essentially re-write history in a sane sequence after having worked on a complex task.

Regards,

Sitaram