From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Jan 2009 05:51:38 +0000 (-0800)
Subject: Merge branch 'js/patience-diff'
X-Git-Tag: v1.6.2-rc0~97
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5dc1308562ab5991ecada68b06707709bea408c9;p=git-core%2Fgit.git

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
---

5dc1308562ab5991ecada68b06707709bea408c9
diff --cc contrib/completion/git-completion.bash
index 703f4c2e9,b98d765de..81f70ec64
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -782,20 -775,8 +782,21 @@@ __git_diff_common_options="--stat --num
  			--ignore-all-space --exit-code --quiet --ext-diff
  			--no-ext-diff
  			--no-prefix --src-prefix= --dst-prefix=
 -			--base --ours --theirs
 +			--inter-hunk-context=
+ 			--patience
 +			--raw
 +"
 +
 +_git_diff ()
 +{
 +	__git_has_doubledash && return
 +
 +	local cur="${COMP_WORDS[COMP_CWORD]}"
 +	case "$cur" in
 +	--*)
 +		__gitcomp "--cached --pickaxe-all --pickaxe-regex
 +			--base --ours --theirs
 +			$__git_diff_common_options
  			"
  		return
  		;;