summaryrefslogtreecommitdiff
path: root/include/git2/diff.h
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-10-21 15:36:38 -0700
committerRussell Belfer <rb@github.com>2013-10-21 15:36:38 -0700
commit5de4ec810492178095897f726bfaf879994aaf11 (patch)
tree266f521ca7fc71f871794d27ec9cc7ea5b1f122d /include/git2/diff.h
parent623460ab139bbb0360f51b26ac27fb6932569278 (diff)
downloadlibgit2-5de4ec810492178095897f726bfaf879994aaf11.tar.gz
Implement patience and minimal diff flags
It seems that to implement these options, we just have to pass the appropriate flags through to the libxdiff code taken from core git. So let's do it (and add a test).
Diffstat (limited to 'include/git2/diff.h')
-rw-r--r--include/git2/diff.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h
index ed9f71355..505c3e793 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -175,8 +175,11 @@ typedef enum {
*/
GIT_DIFF_SHOW_UNMODIFIED = (1u << 26),
- /** Use the "patience diff" algorithm (currently unimplemented) */
+ /** Use the "patience diff" algorithm */
GIT_DIFF_PATIENCE = (1u << 28),
+ /** Take extra time to find minimal diff */
+ GIT_DIFF_MINIMAL = (1 << 29),
+
} git_diff_option_t;
/**