diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 11:24:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-06 16:20:01 (GMT) |
| commit | 18b037a5b61532cba7f19efdb2e75c258d87d3d7 (patch) | |
| tree | c41f8c974a9728d7ab8ce495a4527e121240664c /builtin/merge-recursive.c | |
| parent | 73cf7f713da4fc797e2393a9e490ad4ec9466c53 (diff) | |
| download | git-18b037a5b61532cba7f19efdb2e75c258d87d3d7.zip git-18b037a5b61532cba7f19efdb2e75c258d87d3d7.tar.gz git-18b037a5b61532cba7f19efdb2e75c258d87d3d7.tar.bz2 | |
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>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions