diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:44 -0800 |
| commit | 1ae0949a036864de1f5caa7b375b875284d1c69e (patch) | |
| tree | 800b0226c23ed0596f38507d4d4ad8818307a94e /builtin | |
| parent | Merge branch 'jt/apply-reverse-twice' (diff) | |
| parent | diff: add -I<regex> that ignores matching changes (diff) | |
| download | tgif-1ae0949a036864de1f5caa7b375b875284d1c69e.tar.xz | |
Merge branch 'mk/diff-ignore-regex'
"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.
* mk/diff-ignore-regex:
diff: add -I<regex> that ignores matching changes
merge-base, xdiff: zero out xpparam_t structures
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index e72714a5a8..de8520778d 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -109,6 +109,7 @@ static void show_diff(struct merge_list *entry) xdemitconf_t xecfg; xdemitcb_t ecb; + memset(&xpp, 0, sizeof(xpp)); xpp.flags = 0; memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; |