Unverified Commit a5644b80 by Edward Thomson Committed by GitHub

Merge pull request #6068 from libgit2/ethomson/diff_enum

diff: update `GIT_DIFF_IGNORE_BLANK_LINES`
parents efa0d64e 1ba7c327
...@@ -133,6 +133,9 @@ typedef enum { ...@@ -133,6 +133,9 @@ typedef enum {
*/ */
GIT_DIFF_INDENT_HEURISTIC = (1u << 18), 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 */ /** Treat all files as text, disabling binary attributes & detection */
GIT_DIFF_FORCE_TEXT = (1u << 20), GIT_DIFF_FORCE_TEXT = (1u << 20),
/** Treat all files as binary, disabling text diffs */ /** Treat all files as binary, disabling text diffs */
...@@ -168,10 +171,6 @@ typedef enum { ...@@ -168,10 +171,6 @@ typedef enum {
* can apply given diff information to binary files. * can apply given diff information to binary files.
*/ */
GIT_DIFF_SHOW_BINARY = (1u << 30), GIT_DIFF_SHOW_BINARY = (1u << 30),
/** Ignore blank lines */
GIT_DIFF_IGNORE_BLANK_LINES = (1u << 31),
} git_diff_option_t; } git_diff_option_t;
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment