Merge branch 'tb/complete-diff-ignore-blank-lines'

* tb/complete-diff-ignore-blank-lines: completion: Add --ignore-blank-lines for diff
git-mirror · Sep 19, 2014 · b6de2dc · b6de2dc
2 parents 14e2ae6 + c254516
commit b6de2dc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1175,8 +1175,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--full-index --binary --abbrev --diff-filter=
 			--find-copies-harder
 			--text --ignore-space-at-eol --ignore-space-change
-			--ignore-all-space --exit-code --quiet --ext-diff
-			--no-ext-diff
+			--ignore-all-space --ignore-blank-lines --exit-code
+			--quiet --ext-diff --no-ext-diff
 			--no-prefix --src-prefix= --dst-prefix=
 			--inter-hunk-context=
 			--patience --histogram --minimal