Re: Messing with the VC history

[Achim Gratz]

Eli Zaretskii writes:
>> ...or configure Git to have "git pull" do exactly that, at least for the
>> branches that are going upstream.
>
> What about "pull --rebase=preserve"?  It sounds like a less radical
> option, did I miss something?

Yes, you can do that if you use an up-to-date Git version.  Not everyone
involved here is using a new enough version to use the "preserve" option
(and yes, you can configure that on a global, local or branch-by-branch
basis too) I have gathered from the discussions so far.  For the usual
"let's fix this thing and get it upstream" type of work it shouldn't
matter.  Otherwise you'll have to remember to configure your feature
branches differently if they contain merges (local merges that is,
because merges with upstream wouldn't enter into the branch if you
rebase by default).  For longer term work that's kept in feature
branches I prefer to rebase on top of upstream rather than merge and
usually do a full rewrite before pushing it upstream as well.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptation for Waldorf microQ V2.22R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada