Thread (33 messages) flat view 33 messages, 5 authors, 2016-06-15

Re: [PATCH 3/6] ll-merge: let caller decide whether to renormalize

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:49:14

Jonathan Nieder [off-list ref] writes:
Add a "renormalize" parameter to ll_merge so callers can decide on a
case-by-case basis whether the merge is likely to have overlapped with
a change in smudge/clean rules.  This reveals a few commands that have
not been taking that situation into account, though it does not fix
them.

No change in behavior intended.
Looking nice so far; I however think a separate "renormalize" parameter
should be folded into "flag" word, perhaps with a few new macros to make
it easier to access renormalize, virtual-ancestor, and favor-side parts
it.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help