From: Joshua Jensen <jjensen@workspacewhiz.com>
To: Eric Raible <raible@nextest.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Euguess@gmail.com, git@vger.kernel.org
Subject: Re: Why the default action for pull is merge, but not rebase?
Date: Wed, 27 Oct 2010 20:53:41 -0600 [thread overview]
Message-ID: <4CC8E5B5.7050404@workspacewhiz.com> (raw)
In-Reply-To: <4CC87DE6.9090604@nextest.com>
----- Original Message -----
From: Eric Raible
Date: 10/27/2010 1:30 PM
> One frustrating aspect of branch.<name>.rebase is that AFAIK
> there's no way for it to preserve merges.
>
> I would much prefer if branch.<name>.rebase was allowed to
> specify the arguments to be passed to rebase:
>
> git config branch.mybranch.rebase "-i --preserve-merges"
>
> Anyone else see the value of something like this?
When --preserve-merges actually preserves the merges (perhaps the
rebase-i-p branch is on the way to finishing this feature?? I couldn't
get it to apply...), I would like this facility very much. By default,
I think rebase *should* preserve merges, and the current flattening it
does now should be an option.
Josh
next prev parent reply other threads:[~2010-10-28 2:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-27 16:46 Why the default action for pull is merge, but not rebase? Eugene Sajine
2010-10-27 16:57 ` Jonathan Nieder
2010-10-27 17:21 ` Eugene Sajine
2010-10-27 17:36 ` Jonathan Nieder
[not found] ` <0016e645b8c87a160804939cdc5e@google.com>
2010-10-27 17:58 ` Eugene Sajine
2010-10-27 18:05 ` Jonathan Nieder
2010-10-27 19:30 ` Eric Raible
2010-10-28 2:53 ` Joshua Jensen [this message]
2010-10-28 3:27 ` Kevin Ballard
2010-10-28 6:39 ` Eric Raible
2010-10-28 7:13 ` Kevin Ballard
2010-10-28 7:27 ` Stefan Haller
2010-10-28 6:17 ` Björn Steinbrink
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=4CC8E5B5.7050404@workspacewhiz.com \
--to=jjensen@workspacewhiz.com \
--cc=Euguess@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=raible@nextest.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.