* [RFH] specifying rebase options when branch.<name>.rebase = true
@ 2010-06-10 19:01 Eric Raible
2010-06-10 21:52 ` [RFH] specifying rebase options when branch.<name>.rebase " Eric Raible
0 siblings, 1 reply; 2+ messages in thread
From: Eric Raible @ 2010-06-10 19:01 UTC (permalink / raw)
To: Git Mailing List
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?
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [RFH] specifying rebase options when branch.<name>.rebase = true
2010-06-10 19:01 [RFH] specifying rebase options when branch.<name>.rebase = true Eric Raible
@ 2010-06-10 21:52 ` Eric Raible
0 siblings, 0 replies; 2+ messages in thread
From: Eric Raible @ 2010-06-10 21:52 UTC (permalink / raw)
To: git
s/not seen a was/not seen a way/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-10 21:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-10 19:01 [RFH] specifying rebase options when branch.<name>.rebase = true Eric Raible
2010-06-10 21:52 ` [RFH] specifying rebase options when branch.<name>.rebase " Eric Raible
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).