Merge branch 'jl/submodule-deinit'

There was no Porcelain way to say "I no longer am interested in
this submodule", once you express your interest in a submodule with
"submodule init".  "submodule deinit" is the way to do so.

* jl/submodule-deinit:
  submodule: add 'deinit' command

diff --cc Documentation/git-rm.txt
Simple merge

diff --cc Documentation/git-submodule.txt
index c99d795618f59bf98969b551f2a931680534f18e,27cd57a7e4e9efe7a79e562c955ff9d4f07a3d23..74d5bdc59d58f743bc6f5cb5f7f9ee24d384d5c8
--- 1/Documentation/git-submodule.txt
--- 2/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@@ -13,9 -13,9 +13,10 @@@ SYNOPSI
              [--reference <repository>] [--] <repository> [<path>]
  'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
  'git submodule' [--quiet] init [--] [<path>...]
 -'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase]
 -            [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
+ 'git submodule' [--quiet] deinit [-f|--force] [--] <path>...
 +'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
 +            [-f|--force] [--rebase] [--reference <repository>]
 +            [--merge] [--recursive] [--] [<path>...]
  'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
              [commit] [--] [<path>...]
  'git submodule' [--quiet] foreach [--recursive] <command>

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc git-submodule.sh
index ab29bfeb738d1b8f452c558ba6f6d7aa4e854b3d,c1a3202d410ef7cd62f5580e1b9d05743b9387bc..204bc78a9fdffcd11c397a85f94636bb17529b91
--- 1/git-submodule.sh
--- 2/git-submodule.sh
+++ b/git-submodule.sh
@@@ -8,7 -8,8 +8,8 @@@ dashless=$(basename "$0" | sed -e 's/-
  USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>]
     or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
     or: $dashless [--quiet] init [--] [<path>...]
 -   or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
+    or: $dashless [--quiet] deinit [-f|--force] [--] <path>...
 +   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
     or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
     or: $dashless [--quiet] foreach [--recursive] <command>
     or: $dashless [--quiet] sync [--recursive] [--] [<path>...]"

diff --cc t/t7400-submodule-basic.sh
Simple merge