diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-09 11:21:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-09 11:21:20 -0700 |
| commit | a4fd114ffca1e3c5fff48df382298c2ef9a32f67 (patch) | |
| tree | eaf745471a0fff86b07fc81c61ce26d89b143804 /contrib | |
| parent | Merge branch 'rj/t1050-use-test-path-is-file' (diff) | |
| parent | completion: add diff --color-moved[-ws] (diff) | |
| download | tgif-a4fd114ffca1e3c5fff48df382298c2ef9a32f67.tar.xz | |
Merge branch 'kk/complete-diff-color-moved'
Completion update.
* kk/complete-diff-color-moved:
completion: add diff --color-moved[-ws]
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 52e2168c0b..c21786f2fd 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1492,9 +1492,16 @@ __git_diff_algorithms="myers minimal patience histogram" __git_diff_submodule_formats="diff log short" +__git_color_moved_opts="no default plain blocks zebra dimmed-zebra" + +__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change + ignore-all-space allow-indentation-change" + __git_diff_common_options="--stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color --no-color --color-words --no-renames --check + --color-moved --color-moved= --no-color-moved + --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change @@ -1525,6 +1532,14 @@ _git_diff () __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}" return ;; + --color-moved=*) + __gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}" + return + ;; + --color-moved-ws=*) + __gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}" + return + ;; --*) __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex --base --ours --theirs --no-index |