diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-05 13:24:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-06 18:20:01 +0200 |
| commit | 18b037a5b61532cba7f19efdb2e75c258d87d3d7 (patch) | |
| tree | c41f8c974a9728d7ab8ce495a4527e121240664c /ll-merge.h | |
| parent | ll-merge: make flag easier to populate (diff) | |
| download | git-18b037a5b61532cba7f19efdb2e75c258d87d3d7.tar.xz git-18b037a5b61532cba7f19efdb2e75c258d87d3d7.zip | |
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 'll-merge.h')
| -rw-r--r-- | ll-merge.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h index 5990271dce..ff7ca87bfa 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -8,6 +8,7 @@ #define LL_OPT_VIRTUAL_ANCESTOR (1 << 0) #define LL_OPT_FAVOR_MASK ((1 << 1) | (1 << 2)) #define LL_OPT_FAVOR_SHIFT 1 +#define LL_OPT_RENORMALIZE (1 << 3) static inline int ll_opt_favor(int flag) { |