diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-24 08:51:38 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-24 08:51:38 +0300 |
| commit | 5dc1308562ab5991ecada68b06707709bea408c9 (patch) | |
| tree | 321b8d7310c01d8b01584377d9aba448952a7384 /contrib | |
| parent | f3d6073e02f8ee8dc6376b0262151dbbfbbdfe7d (diff) | |
| parent | cc545709253fe8440db2648cb5c771e5b126bdb5 (diff) | |
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 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 703f4c2e90..81f70ec644 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -783,6 +783,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --no-ext-diff --no-prefix --src-prefix= --dst-prefix= --inter-hunk-context= + --patience --raw " |