diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-23 21:51:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-23 21:51:38 -0800 |
| commit | 5dc1308562ab5991ecada68b06707709bea408c9 (patch) | |
| tree | 321b8d7310c01d8b01584377d9aba448952a7384 /diff.c | |
| parent | f3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d (diff) | |
| parent | cc545709253fe8440db2648cb5c771e5b126bdb5 (diff) | |
| download | git-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.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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")) { |