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

Re: Rebase semantic and cherry-pick

From: Jakub Narebski <hidden>
Date: 2016-06-15 22:42:22

Linus Torvalds wrote:
In contrast, here's an alternate workflow that is much easier to explain,
and doesn't involve "rebase" at all:

git checkout his
git cherry-pick origin..mine
[...] 
Now, "git cherry-pick" doesn't actually support the above format, and I'm
not saying that the "git rebase" name itself is evil. I think we could fix
"git rebase" to work better, but the semantics - the way they are
_designed_ right now - are just horrible.
Perhaps if possible also have

git cherry-pick --whole-branch branchname

meaning

git cherry-pick branchname:begining..branchname:HEAD

-- 
Jakub Narebski
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help