From: Pierre Habouzit <madcoder@debian.org>
To: git@vger.kernel.org
Subject: Re: What's the best method between merging and rebasing ?
Date: Mon, 12 Mar 2007 20:43:09 +0100 [thread overview]
Message-ID: <20070312194309.GI30489@mad.intersec.eu> (raw)
In-Reply-To: <45F589BF.28E3A5AD@eudaptics.com>
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
On Mon, Mar 12, 2007 at 06:11:27PM +0100, Johannes Sixt wrote:
> Xavier Maillard wrote:
> > -> D -> E -> F -> several commits from old master -> HEAD (of new master)
> >
> > So it seems to be cherry-picks + rebase master on new HEAD but I
> > am not sure at how things are doing :)
>
> Just to get the wording straight: You mean "reset master to new HEAD",
> not "rebase". "reset" means to point the branch identifier ("master") to
> some commit - with or without modifying the working directory
> accordingly. OTOH, "rebase" means to re-apply a string of commits on top
> of some other commit.
err that was indeed a lapsus from me. Sorry for the mistake, that was
indeed what I intended to say.
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-03-12 19:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-12 11:39 What's the best method between merging and rebasing ? Xavier Maillard
2007-03-12 12:08 ` Pierre Habouzit
2007-03-12 16:34 ` Xavier Maillard
2007-03-12 17:11 ` Johannes Sixt
2007-03-12 19:43 ` Pierre Habouzit [this message]
2007-03-12 17:37 ` Pierre Habouzit
2007-03-12 19:14 ` Xavier Maillard
2007-03-12 19:42 ` Pierre Habouzit
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=20070312194309.GI30489@mad.intersec.eu \
--to=madcoder@debian.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).