diff options
| author | Sun He <sunheehnus@gmail.com> | 2014-03-06 11:16:36 +0800 |
|---|---|---|
| committer | Sun He <sunheehnus@gmail.com> | 2014-03-06 11:16:36 +0800 |
| commit | 6246de93b65fc74cba2e17ab031402adff84433f (patch) | |
| tree | 676fbb35641726736b0cc8053f73ec9f1ed03d0e /examples | |
| parent | 8384a50a2171f57cc1b8158777b124d2022db94e (diff) | |
| parent | a064dc2d0b6206116a35be4b62c58c3c1170d5de (diff) | |
| download | libgit2-6246de93b65fc74cba2e17ab031402adff84433f.tar.gz | |
Merge completed: resolve the conflict with the upstream
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/diff.c b/examples/diff.c index d87edcdaa..6f68e8305 100644 --- a/examples/diff.c +++ b/examples/diff.c @@ -238,6 +238,10 @@ static void parse_opts(struct opts *o, int argc, char *argv[]) o->diffopts.flags |= GIT_DIFF_INCLUDE_IGNORED; else if (!strcmp(a, "--untracked")) o->diffopts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; + else if (!strcmp(a, "--patience")) + o->diffopts.flags |= GIT_DIFF_PATIENCE; + else if (!strcmp(a, "--minimal")) + o->diffopts.flags |= GIT_DIFF_MINIMAL; else if (!strcmp(a, "--numstat")) o->numstat = 1; else if (!strcmp(a, "--shortstat")) |