From: Eric Raible <raible@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: [RFH] specifying rebase options when branch.<name>.rebase = true
Date: Thu, 10 Jun 2010 12:01:34 -0700 [thread overview]
Message-ID: <AANLkTimbBZVWk2EzXIngSV6Kblap1k8mPbfEa8OOGxUh@mail.gmail.com> (raw)
In setting up our rebase-based workflow I'd like people
to simply use "git pull". But "branch.<name>.rebase=true"
gets me only halfway there.
The problem is that I'd like to rebase local merges as well,
but have not seen a was to specify the --preserve-merges flag.
Am I missing something obvious?
next reply other threads:[~2010-06-10 19:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-10 19:01 Eric Raible [this message]
2010-06-10 21:52 ` [RFH] specifying rebase options when branch.<name>.rebase = true Eric Raible
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTimbBZVWk2EzXIngSV6Kblap1k8mPbfEa8OOGxUh@mail.gmail.com \
--to=raible@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).