| commit | 18b037a5b61532cba7f19efdb2e75c258d87d3d7 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Thu, 5 Aug 2010 11:24:58 +0000 (5 06:24 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Aug 2010 16:20:01 +0000 (6 09:20 -0700) | ||
| tree | c41f8c974a9728d7ab8ce495a4527e121240664c | treesnapshot (tar.gz zip) |
| parent | 73cf7f713da4fc797e2393a9e490ad4ec9466c53 | commitdiff |
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>
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>
| builtin/checkout.c | diffblobblamehistory | |
| ll-merge.c | diffblobblamehistory | |
| ll-merge.h | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory | |
| rerere.c | diffblobblamehistory |