Differences

This shows you the differences between two versions of the page.

--- doc:gayas-random-stuff [2014/01/16 13:50] – gkazhoya
+++ doc:gayas-random-stuff [2014/03/18 16:33] – gkazhoya
@@ Line 42: / Line 42: @@
 Hotkeys :
-C-c C-d d   describe slime variable
+C-c C-d d   describe \\
 C-h b      list all bindings. Then C-s slime.
@@ Line 57: / Line 57: @@
 git cherry-pick sha-of-commit
 </code>
+--
 As upstream for your repo set your fork on GitHub and use ''git@github.com:yourusername/forkedrepo.git'' instead of ''https://github.com/yourusername/forkedrepo.git'' so that it uses your RSA keypairs for authentication instead of asking password each time you push.
+--
+Moving dir to another repo with history
+<code bash>
+  cd /tmp
+  git clone https://github.com/cram-code/REPO.git
+  cd REPO
+  git filter-branch --prune-empty --subdirectory-filter MY_DIR -- --all
+  git filter-branch --force --index-filter 'git ls-files -s | sed "s-\t\"*-&newsubdir/-" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD
+  roscd REPO2
+  git remote add tmp /tmp/REPO
+  git pull tmp
+  git commit --amend --vm "Moved MY_DIR here from REPO"
+  git remote rm tmp
+</code>
+---
+When installing both moveit full (including mongo-db deps) and mongodb-10gen, both try to write to the same file. So, force the overwrite when installing the second of the mongodb packages: http://www.webupd8.org/2011/02/fix-dpkg-error-trying-to-overwrite-x.html