summaryrefslogtreecommitdiffstats
path: root/cholerab/HACKING/git
diff options
context:
space:
mode:
Diffstat (limited to 'cholerab/HACKING/git')
-rw-r--r--cholerab/HACKING/git/log-follow6
-rw-r--r--cholerab/HACKING/git/remove-submodule5
2 files changed, 11 insertions, 0 deletions
diff --git a/cholerab/HACKING/git/log-follow b/cholerab/HACKING/git/log-follow
new file mode 100644
index 00000000..5bdc41bd
--- /dev/null
+++ b/cholerab/HACKING/git/log-follow
@@ -0,0 +1,6 @@
+# preserve history after move
+you do not have to [✈], simply use:
+ git log --follow .
+
+
+[✈] http://stackoverflow.com/questions/2314652/is-it-possible-to-move-rename-files-in-git-and-maintain-their-history
diff --git a/cholerab/HACKING/git/remove-submodule b/cholerab/HACKING/git/remove-submodule
new file mode 100644
index 00000000..da8a1b00
--- /dev/null
+++ b/cholerab/HACKING/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.
+