Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge completed: resolve the conflict with the upstream

Browse Source
This commit is contained in:
Sun He
2014-03-06 11:16:36 +08:00
parent 8384a50a21 a064dc2d0b
commit 6246de93b6
16 changed files with 309 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/diff.c
View File

@@ -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"))