summaryrefslogtreecommitdiff
path: root/examples/diff.c
diff options
context:
space:
mode:
authorVicent Marti <vicent@github.com>2014-03-05 11:42:50 +0100
committerVicent Marti <vicent@github.com>2014-03-05 11:42:50 +0100
commit68581754f3a37e7712e3983acfeff0ff598e4eb6 (patch)
treef2e91804825b6b0ee405819d644daf83efe67a22 /examples/diff.c
parentd2b7841d669b0afba5740422958c2c3c2f83dde5 (diff)
parent0d3c8a9d9202f69ee0366f2eeab1765b18b49baa (diff)
downloadlibgit2-68581754f3a37e7712e3983acfeff0ff598e4eb6.tar.gz
Merge pull request #2160 from modocache/examples-diff-add-patience-and-minimal
examples/diff: Add minimal, patience diff options.
Diffstat (limited to 'examples/diff.c')
-rw-r--r--examples/diff.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/diff.c b/examples/diff.c
index de994ecab..65c618882 100644
--- a/examples/diff.c
+++ b/examples/diff.c
@@ -234,6 +234,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 (match_uint16_arg(