summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-21 18:26:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-21 18:26:41 (GMT)
commit3e7a5b489e45ae8a3a0b222893d58b172d883136 (patch)
tree414440d565cccd07146c0f31f4ff7336aaebf5c1
parent266f1fdfa99f5d29ca7ce455966e7960c00a82e4 (diff)
parentc0add3073a5bd0e295cdaea76e5c9b7805f8a047 (diff)
downloadgit-3e7a5b489e45ae8a3a0b222893d58b172d883136.zip
git-3e7a5b489e45ae8a3a0b222893d58b172d883136.tar.gz
git-3e7a5b489e45ae8a3a0b222893d58b172d883136.tar.bz2
Sync with maint
* maint: completion: complete diff --word-diff
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index fd9a1d5..6c3bafe 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1163,7 +1163,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
--no-prefix --src-prefix= --dst-prefix=
--inter-hunk-context=
--patience --histogram --minimal
- --raw
+ --raw --word-diff
--dirstat --dirstat= --dirstat-by-file
--dirstat-by-file= --cumulative
--diff-algorithm=