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
This commit is contained in:
Junio C Hamano 2017-02-03 11:25:19 -08:00
Родитель 36acf41239 462f213429
Коммит 74dee5cfae
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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