diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-06-12 12:40:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 12:40:11 +0100 |
| commit | 291cf12e5e776c63ff128438c07e0f2533fbb3cb (patch) | |
| tree | 93bea2ee47f2cab1c57424f69f3896481cb73a29 /include/git2 | |
| parent | 3be7301151e44537d2423386dc71f1d3e496c664 (diff) | |
| parent | 2d9d246409d8131dfbbded2f880b784f205e93a5 (diff) | |
| download | libgit2-291cf12e5e776c63ff128438c07e0f2533fbb3cb.tar.gz | |
Merge pull request #4680 from pks-t/pks/diff-opts-enum
diff: fix enum value being out of allowed range
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/diff.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index b7240ff98..3d810f589 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -171,6 +171,12 @@ typedef enum { * Options controlling how output will be generated */ + /** Use a heuristic that takes indentation and whitespace into account + * which generally can produce better diffs when dealing with ambiguous + * diff hunks. + */ + GIT_DIFF_INDENT_HEURISTIC = (1u << 18), + /** Treat all files as text, disabling binary attributes & detection */ GIT_DIFF_FORCE_TEXT = (1u << 20), /** Treat all files as binary, disabling text diffs */ @@ -206,12 +212,6 @@ typedef enum { * can apply given diff information to binary files. */ GIT_DIFF_SHOW_BINARY = (1u << 30), - - /** Use a heuristic that takes indentation and whitespace into account - * which generally can produce better diffs when dealing with ambiguous - * diff hunks. - */ - GIT_DIFF_INDENT_HEURISTIC = (1u << 31), } git_diff_option_t; /** |
