From: Shawn Pearce <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Jakub Narebski <jnareb@gmail.com>, git@vger.kernel.org
Subject: Re: git-merge-subordinate
Date: Wed, 25 Oct 2006 12:27:58 -0400 [thread overview]
Message-ID: <20061025162758.GC9312@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.63.0610251819080.3286@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Wed, 25 Oct 2006, Jakub Narebski wrote:
>
> > Matthew Wilcox wrote:
> >
> > > Linus doesn't like seeing unnecessary merges in his tree. I'm not a huge
> > > fan of them either. Wouldn't it be nice if we had a merge method that
> > > did a merge without creating a merge? I call it git-merge-subordinate
> > > (since my tree is subordinate to the tree I'm pulling from). I suppose
> > > you could call it 'slave' if you want to be more pithy. Anyway, this
> > > is a first attempt, and it's totally cargo-cult programming; I make no
> > > claim that I understand what I'm doing. But it does seem to work.
> >
> > Hmmm... the --squash option to git-merge/git-pull isn't enough?
>
> What subordinate does is not _merge_, but _rebase_ on top of the fetched
> commit. So yes, --squash isn't enough ;-)
And I would suggest calling it 'git-merge-rebase', as the strategy
really is rebase... :-)
--
prev parent reply other threads:[~2006-10-25 16:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-25 15:50 git-merge-subordinate Matthew Wilcox
2006-10-25 16:11 ` git-merge-subordinate Jakub Narebski
2006-10-25 16:19 ` git-merge-subordinate Johannes Schindelin
2006-10-25 16:27 ` Shawn Pearce [this message]
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=20061025162758.GC9312@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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.