diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 06:24:58 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-06 09:20:01 -0700 |
| commit | 18b037a5b61532cba7f19efdb2e75c258d87d3d7 (patch) | |
| tree | c41f8c974a9728d7ab8ce495a4527e121240664c /contrib/examples/git-merge-ours.sh | |
| parent | ll-merge: make flag easier to populate (diff) | |
| download | tgif-18b037a5b61532cba7f19efdb2e75c258d87d3d7.tar.xz | |
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 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions