aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2009-01-01 17:39:17 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-07 13:37:07 -0800
commit34292bddb861f3cb52a524fdce67234430a744fe (patch)
tree9a74c749c894ff44233e024ba16e24c5c18ca9cc /diff.c
parent92b7de93fb7801570ddc3195f03f30b9c201a3bd (diff)
downloadgit-34292bddb861f3cb52a524fdce67234430a744fe.tar.gz
git-34292bddb861f3cb52a524fdce67234430a744fe.tar.xz
Introduce the diff option '--patience'
This commit teaches Git to produce diff output using the patience diff algorithm with the diff option '--patience'. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 0484601f4..4aeab7746 100644
--- a/diff.c
+++ b/diff.c
@@ -2471,6 +2471,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")) {