Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: [PATCH] Allow cherry-picking root commits

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:44:53

Possibly related (same subject, not in this thread)

Hi,

On Sat, 5 Jul 2008, Junio C Hamano wrote:
Johannes Schindelin [off-list ref] writes:
quoted
There is no good reason why cherry-picking root commits should not be 
allowed.
Hmm, does "cherry-pick a root commit" even have a well defined 
semantics, other than "if there is no overlap in files just add the 
files in"?
Yes.  You can easily add the files identically, or some similar files, in 
which case you get an easily-resolved conflict.
I have a feeling that it is more likely to be a user error, a sign that 
the user mistyped the name of the commit to pick.
Now, now, that is too harsh a statement!

Often I start my work from a tarball, just because the git import takes so 
long that I can fiddle with the thing already while the import runs.

And guess what, it would be easier to rebase that series onto an imported 
tag for me.  The first commit would not result in changes, since it would 
import the identical tree.  Or it would barf, in which case I would know 
that I got the wrong branch point to rebase onto.

At the moment, I play games that need a deep knowledge of Git, which _I_ 
have, but not necessarily occasional Git users.

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help