X-Git-Url: https://git.xandkar.net/?p=git-cheat-sheet.git;a=blobdiff_plain;f=README.md;h=61f2b7a6c5953c4d383f0584fb2cd4999dd0b02a;hp=81c0cb1320c60ebb1335262b4f8ffafd79cb8c89;hb=64e53fa70692011377bd35449e43855e0d6bb39b;hpb=b5a37a6e5a2c2421ece77504c1ce97ddc0fae46a

diff --git a/README.md b/README.md
index 81c0cb1..61f2b7a 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ Inserting a new root commit
 ---------------------------
 ```sh
 git checkout --orphan $TEMP_BRANCH
-git rm -rf .
+git rm -rf *
 git commit --allow-empty -m $INIT_COMMIT_MSG
 git rebase --onto $TEMP_BRANCH --root $MAIN_BRANCH
 git branch -d $TEMP_BRANCH
@@ -63,3 +63,44 @@ do
     git push $REMOTE_NAME :refs/tags/$tag
 done
 ```
+
+
+Get an older version of a file
+------------------------------
+
+```sh
+git cat-file -p $COMMIT_DIGEST:$FILE_PATH
+```
+
+
+Splitting a commit
+------------------
+
+From [docs](https://git-scm.com/docs/git-rebase#_splitting_commits):
+
+- Start an interactive rebase with `git rebase -i <commit>^`, where `<commit>`
+  is the commit you want to split.
+- Mark the commit you want to split with the action "edit".
+- When it comes to editing that commit, execute `git reset HEAD^`. The effect
+  is that the HEAD is rewound by one, and the index follows suit. However, the
+  working tree stays the same.
+- Now add the changes to the index that you want to have in the first commit
+  (`git add`)
+- Commit the now-current index with whatever commit message is appropriate now.
+- Repeat the last two steps until your working tree is clean.
+- Continue the rebase with `git rebase --continue`.
+
+
+Merge 2 repos
+-------------
+
+```sh
+$ ls -1
+repo_A
+repo_B
+$ cd repo_B
+$ git remote add repo_A ../repo_A
+$ git fetch repo_A --tags
+$ git merge --allow-unrelated-histories repo_A/$BRANCH
+$ git remote remove repo_A
+```