From: Andreas Schwab <schwab@linux-m68k.org>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
Cc: Peter Krefting <peter@softwolves.pp.se>,
"Michael S. Tsirkin" <mst@redhat.com>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH RFC] rebase: add --revisions flag
Date: Wed, 09 Dec 2009 12:48:24 +0100 [thread overview]
Message-ID: <m2pr6ocqrb.fsf@igel.home> (raw)
In-Reply-To: <20091209112237.GA27740@atjola.homenet> ("Björn Steinbrink"'s message of "Wed, 9 Dec 2009 12:22:37 +0100")
Björn Steinbrink <B.Steinbrink@gmx.de> writes:
> Err, no. "git merge --squash foo" merges all changes from the merge base
> of HEAD and foo up to foo. "git cherry-pick foo" takes just the changes
> from foo^ to foo. For example:
>
> A---B---C (master)
> \
> D---E---F (foo)
>
> git cherry-pick foo # Tries to create a new commit with the changes from
> # "git diff D F"
Did you mean "git diff E F"?
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2009-12-09 11:48 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-08 14:47 [PATCH RFC] rebase: add --revisions flag Michael S. Tsirkin
2009-12-08 16:08 ` Björn Steinbrink
2009-12-08 16:11 ` Michael S. Tsirkin
2009-12-08 16:41 ` Björn Steinbrink
2009-12-08 16:49 ` Michael S. Tsirkin
2009-12-08 19:13 ` Björn Steinbrink
2009-12-08 16:14 ` Michael S. Tsirkin
2009-12-08 16:37 ` Björn Steinbrink
2009-12-08 16:44 ` Michael S. Tsirkin
2009-12-08 19:11 ` Björn Steinbrink
2009-12-08 20:00 ` Michael S. Tsirkin
2009-12-09 13:19 ` Björn Steinbrink
2009-12-09 14:02 ` Michael S. Tsirkin
2009-12-09 4:51 ` Miles Bader
2009-12-08 20:22 ` Junio C Hamano
2009-12-08 20:29 ` Sverre Rabbelier
2009-12-09 5:30 ` Christian Couder
2009-12-09 6:52 ` Christian Couder
2009-12-09 9:08 ` Sverre Rabbelier
2009-12-09 8:47 ` Peter Krefting
2009-12-09 9:37 ` Michael S. Tsirkin
2009-12-09 10:52 ` Peter Krefting
2009-12-09 11:22 ` Björn Steinbrink
2009-12-09 11:48 ` Andreas Schwab [this message]
2009-12-09 12:06 ` Björn Steinbrink
2009-12-09 12:07 ` Michael S. Tsirkin
2009-12-09 13:06 ` Björn Steinbrink
2009-12-09 19:46 ` Junio C Hamano
2009-12-10 7:43 ` Björn Steinbrink
2009-12-10 17:20 ` Junio C Hamano
2009-12-11 11:07 ` Björn Steinbrink
2009-12-09 13:20 ` Peter Krefting
2009-12-09 13:41 ` Björn Steinbrink
2009-12-10 8:43 ` Peter Krefting
2009-12-10 11:08 ` Björn Steinbrink
2009-12-09 10:38 ` Michael S. Tsirkin
2009-12-09 10:55 ` Matthieu Moy
2009-12-09 13:30 ` Matthieu Moy
2009-12-09 13:45 ` Michael S. Tsirkin
2009-12-09 14:01 ` Björn Steinbrink
2009-12-09 14:12 ` Michael S. Tsirkin
2009-12-09 20:10 ` Junio C Hamano
2009-12-13 22:47 ` David Kågedal
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=m2pr6ocqrb.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=B.Steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mst@redhat.com \
--cc=peter@softwolves.pp.se \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox