thanks! and a tiny comment

[martin f krafft]

also sprach Yaroslav Halchenko <lists at onerussian.com> [2007.10.23.1650 +0200]:
> and why only we don't have a git feature like "git unmerge"? :-)
> I think that one would be the one needed for a "neat"
> implementation.

I am not sure it's possible. For one thing, after a merge, the two
parent commits are identical: they have been merged, not one has
been merged into the other. So even if you 'merge feature A into
main', after the merge it's not really possible to identify which of
the two parents was 'main'. At least not by Git.

This is an issue I am taking to the git mailing list now:
  http://marc.info/?l=git&m=119315454830638&w=2

> Another negative side-effect that the branch would continue
> officially be known as merged from the original branch supplied
> the patch. Although I do not foresee any use case when we would
> need to merge that branch again, it is somewhat to keep in mind
> (or a log ;-))

You can just merge the branch again, I think.

> > and changes the ID & dates of the commits.
> heh heh -- I should try that first again before keep on talking...
> don't see why IDs and dates should be changed... 

Cherry-picking is not what you think it is. Cherry-picking takes
a commit, applies the diff to the worktree, and if no conflicts are
found, then creates a *new* commit (with new ID and date) with the
same log message and author.

-- 
martin | http://madduck.net/ | http://two.sentenc.es/
 
"es ist gut, eine sache doppelt auszudrücken und ihr einen
 rechten und linken fuß zu geben. auf einem bein kann die wahrheit
 zwar stehen; mit zweien aber wird sie gehen und herumkommen."
                                                -- friedrich nietzsche
 
spamtraps: madduck.bogus at madduck.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature (see http://martin-krafft.net/gpg/)
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20071023/7c18d897/attachment.pgp