From: Francis Galiegue <fg@one2team.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Stephen Haberman <stephen@exigencecorp.com>, git@vger.kernel.org
Subject: Re: pull --preserve-merges
Date: Sat, 8 Nov 2008 18:07:52 +0100 [thread overview]
Message-ID: <200811081807.53199.fg@one2team.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0811081607300.30769@pacific.mpi-cbg.de>
Le Saturday 08 November 2008 16:08:41 Johannes Schindelin, vous avez écrit :
> Hi,
>
> On Fri, 7 Nov 2008, Stephen Haberman wrote:
> > Awhile ago I brought up wanting to have a "rebase with preserve merges"
> > option for `git pull`
>
> That might be something you want, but you cannot call it
>
> git pull --preserve-merges
>
> since everybody used to "pull = fetch && merge" would go "Huh? A merge
> _does_ preserve merges".
>
> If at all, you could call it "--rebase=preserve-merges".
>
Why not --rebase --keep-merges? Personnally, I think it makes things clearer
since in general options are either standalone or have a value.
--
fge
next prev parent reply other threads:[~2008-11-08 17:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-07 22:01 pull --preserve-merges Stephen Haberman
2008-11-08 15:08 ` Johannes Schindelin
2008-11-08 17:07 ` Francis Galiegue [this message]
2008-11-08 17:57 ` Stephen Haberman
2008-11-10 19:05 ` Stephen Haberman
2008-11-10 19:48 ` Johannes Schindelin
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=200811081807.53199.fg@one2team.net \
--to=fg@one2team.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=stephen@exigencecorp.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox