From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Mar 2013 21:00:29 +0000 (-0700)
Subject: Merge branch 'jl/submodule-deinit'
X-Git-Tag: v1.8.3-rc0~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b03b41e24c84731742e132d86ef3e449dcd6ec25;p=thirdparty%2Fgit.git

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

b03b41e24c84731742e132d86ef3e449dcd6ec25
diff --cc Documentation/git-submodule.txt
index c99d795618,27cd57a7e4..74d5bdc59d
--- a/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] deinit [-f|--force] [--] <path>...
 -'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase]
 -	      [--reference <repository>] [--merge] [--recursive] [--] [<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 git-submodule.sh
index ab29bfeb73,c1a3202d41..204bc78a9f
--- a/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] deinit [-f|--force] [--] <path>...
 -   or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<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>...]"