Thread (1 message) 1 message, 1 author, 2019-01-08

Re: Feature request: --preserve-merges to add "exec git merge ..." instead of "pick ..."

From: Junio C Hamano <hidden>
Date: 2019-01-08 18:38:07

Andreas Hennings [off-list ref] writes:
I tried this option after upgrading my git.
Unfortunately, no matter which variation I use, it still attempts to
rebase most or all of the feature branches before merging them.
Possibly depending on their ancestry.
Yes, I know that.  But what I am hoping is that it won't actually
touch the commits on the side branches UNLESS you tell in the insn
sequence to modify them with "edit", "reword", etc. and instead
fast-forward them.

Of course, it will allow you to muck with these commits on the side
branches, which is a potential source of mistakes.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help