aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-23 21:51:38 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-23 21:51:38 -0800
commit5dc1308562ab5991ecada68b06707709bea408c9 (patch)
tree321b8d7310c01d8b01584377d9aba448952a7384 /diff.c
parentf3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d (diff)
parentcc545709253fe8440db2648cb5c771e5b126bdb5 (diff)
downloadgit-5dc1308562ab5991ecada68b06707709bea408c9.tar.gz
git-5dc1308562ab5991ecada68b06707709bea408c9.tar.xz
Merge branch 'js/patience-diff'
* js/patience-diff: bash completions: Add the --patience option Introduce the diff option '--patience' Implement the patience diff algorithm Conflicts: contrib/completion/git-completion.bash
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 073131316..82cff975b 100644
--- a/diff.c
+++ b/diff.c
@@ -2474,6 +2474,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
options->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
else if (!strcmp(arg, "--ignore-space-at-eol"))
options->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
+ else if (!strcmp(arg, "--patience"))
+ options->xdl_opts |= XDF_PATIENCE_DIFF;
/* flags options */
else if (!strcmp(arg, "--binary")) {