From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: Rebase semantic and cherry-pick
Date: Thu, 30 Mar 2006 03:59:16 +0200 [thread overview]
Message-ID: <e0fe1h$d5r$1@sea.gmane.org> (raw)
In-Reply-To: Pine.LNX.4.64.0603291102440.15714@g5.osdl.org
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
next prev parent reply other threads:[~2006-03-30 1:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-29 1:43 How to switch kernel customizations from 2.6.15.6 to 2.6.16? Matt McCutchen
2006-03-29 2:10 ` Linus Torvalds
2006-03-29 2:30 ` Junio C Hamano
2006-03-29 3:58 ` Junio C Hamano
2006-03-29 19:27 ` Linus Torvalds
2006-03-29 19:39 ` Linus Torvalds
2006-03-29 20:24 ` Junio C Hamano
2006-03-30 1:59 ` Jakub Narebski [this message]
2006-03-30 2:38 ` Rebase semantic and cherry-pick Junio C Hamano
2006-03-30 2:54 ` Linus Torvalds
2006-03-30 3:40 ` Junio C Hamano
2006-03-30 3:15 ` How to switch kernel customizations from 2.6.15.6 to 2.6.16? Junio C Hamano
2006-03-29 2:23 ` Shawn Pearce
2006-03-29 2:26 ` Junio C Hamano
2006-03-30 3:01 ` Matt McCutchen
2006-03-30 3:22 ` Junio C Hamano
2006-03-30 3:47 ` Matt McCutchen
2006-03-30 17:32 ` Linus Torvalds
2006-03-30 21:50 ` Matt McCutchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='e0fe1h$d5r$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.