From: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu, 5 Aug 2010 11:24:58 +0000 (-0500)
Subject: ll-merge: let caller decide whether to renormalize
X-Git-Tag: v1.7.3-rc0~17^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/18b037a5b61532cba7f19efdb2e75c258d87d3d7?ds=inline;hp=18b037a5b61532cba7f19efdb2e75c258d87d3d7

ll-merge: let caller decide whether to renormalize

Add a “renormalize” bit to the ll-merge options word 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 functional change intended.

Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---