diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-09-22 08:48:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 08:48:17 -0400 |
| commit | a5644b8090b2ebc6ee3462cb4fa178971fd5342b (patch) | |
| tree | 2f5a3d44b8ca22e8640d5e410833492f6b86009f | |
| parent | efa0d64e03c705bdbdfe56f0cac210322b76702e (diff) | |
| parent | 1ba7c32709cb7bc1cc0d11d1a87a7d952eb514ae (diff) | |
| download | libgit2-a5644b8090b2ebc6ee3462cb4fa178971fd5342b.tar.gz | |
Merge pull request #6068 from libgit2/ethomson/diff_enum
diff: update `GIT_DIFF_IGNORE_BLANK_LINES`
| -rw-r--r-- | include/git2/diff.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index a0a15e76f..a14c01993 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -133,6 +133,9 @@ typedef enum { */ GIT_DIFF_INDENT_HEURISTIC = (1u << 18), + /** Ignore blank lines */ + GIT_DIFF_IGNORE_BLANK_LINES = (1u << 19), + /** Treat all files as text, disabling binary attributes & detection */ GIT_DIFF_FORCE_TEXT = (1u << 20), /** Treat all files as binary, disabling text diffs */ @@ -168,10 +171,6 @@ typedef enum { * can apply given diff information to binary files. */ GIT_DIFF_SHOW_BINARY = (1u << 30), - - /** Ignore blank lines */ - GIT_DIFF_IGNORE_BLANK_LINES = (1u << 31), - } git_diff_option_t; /** |