diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-21 11:26:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-21 11:26:41 -0700 |
| commit | 3e7a5b489e45ae8a3a0b222893d58b172d883136 (patch) | |
| tree | 414440d565cccd07146c0f31f4ff7336aaebf5c1 | |
| parent | transport-helper: be quiet on read errors from helpers (diff) | |
| parent | completion: complete diff --word-diff (diff) | |
| download | tgif-3e7a5b489e45ae8a3a0b222893d58b172d883136.tar.xz | |
Sync with maint
* maint:
completion: complete diff --word-diff
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fd9a1d5f6c..6c3bafeea5 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= |