summaryrefslogtreecommitdiffstats
path: root/cholerab/cockbook/git
diff options
context:
space:
mode:
authorEUcancER <root@euer.krebsco.de>2011-08-31 12:52:15 +0200
committerEUcancER <root@euer.krebsco.de>2011-08-31 12:52:15 +0200
commit8e2af5a9f643632b96564706313edd4524f81bfd (patch)
tree10e31222000cc4e289c555f6eb487502c273afb4 /cholerab/cockbook/git
parentefe72ae286caa4ecf88edcbcb619fb0ceb886ca8 (diff)
parent9030631edd4f5e44234fe77348b92190874f42a2 (diff)
Gigantor Merge!
Conflicts: cholerab/news/Candidate - add Ante scriptum cholerab/shirts/bestellliste - merged as theirs oncology/dpfhack_display - now a submodule add bug-fixing for adv_graphgen, as well as a Makefile
Diffstat (limited to 'cholerab/cockbook/git')
-rw-r--r--cholerab/cockbook/git/remove-submodule5
1 files changed, 5 insertions, 0 deletions
diff --git a/cholerab/cockbook/git/remove-submodule b/cholerab/cockbook/git/remove-submodule
new file mode 100644
index 00000000..da8a1b00
--- /dev/null
+++ b/cholerab/cockbook/git/remove-submodule
@@ -0,0 +1,5 @@
+Delete the relevant line from the .gitmodules file.
+Delete the relevant section from .git/config.
+Run git rm --cached path_to_submodule (no trailing slash).
+Commit and delete the now untracked submodule files.
+