diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-03 11:25:19 -0800 |
| commit | 74dee5cfae1250693447349f3f6bbc26201c5524 (patch) | |
| tree | e55bccdc962f6eff66f003b72232fb2cebbb0b25 /contrib | |
| parent | 36acf41239a7406d52faf1b6c757ffe34e3be98d (diff) | |
| parent | 462f213429c728d68e5178580040af5832fa0bb8 (diff) | |
| download | git-74dee5cfae1250693447349f3f6bbc26201c5524.tar.gz git-74dee5cfae1250693447349f3f6bbc26201c5524.tar.xz | |
Merge branch 'pl/complete-diff-submodule-diff'
The command line completion (in contrib/) learned that
"git diff --submodule=" can take "diff" as a recently added option.
* pl/complete-diff-submodule-diff:
Completion: Add support for --submodule=diff
Diffstat (limited to 'contrib')
| -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 6721ff80f..97d73ad88 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1206,7 +1206,7 @@ _git_describe () __git_diff_algorithms="myers minimal patience histogram" -__git_diff_submodule_formats="log short" +__git_diff_submodule_formats="diff log short" __git_diff_common_options="--stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color |