summaryrefslogtreecommitdiffstats
path: root/cholerab/cockbook/git
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2011-08-30 11:25:00 +0200
committermakefu <github@syntax-fehler.de>2011-08-30 11:25:00 +0200
commitbbf2bc45f02e8795b8cda6dde262226cd658bfd4 (patch)
tree4089d3fd6ac40c0d5a91dae46a444d4c62139a22 /cholerab/cockbook/git
parentcd4f8b3394e02bcb7d86d53d1b98b4b4b868b78b (diff)
parentb1f0a73e5810aed4fd78aad2bb55a8a67f76df5d (diff)
Merge branch 'master' of github.com:krebscode/painload into punani_files
Conflicts: .gitmodules
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.
+