From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Feb 2017 19:25:19 +0000 (-0800)
Subject: Merge branch 'pl/complete-diff-submodule-diff'
X-Git-Tag: v2.12.0-rc0~2
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=74dee5cfae1250693447349f3f6bbc26201c5524;p=git.git

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

74dee5cfae1250693447349f3f6bbc26201c5524