home
/
code
/
git-cheat-sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix unintended deletion of current directory
[git-cheat-sheet.git]
/
README.md
diff --git
a/README.md
b/README.md
index
37c1ae4
..
61f2b7a
100644
(file)
--- a/
README.md
+++ b/
README.md
@@
-47,7
+47,7
@@
Inserting a new root commit
---------------------------
```sh
git checkout --orphan $TEMP_BRANCH
---------------------------
```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
git commit --allow-empty -m $INIT_COMMIT_MSG
git rebase --onto $TEMP_BRANCH --root $MAIN_BRANCH
git branch -d $TEMP_BRANCH
@@
-89,3
+89,18
@@
From [docs](https://git-scm.com/docs/git-rebase#_splitting_commits):
- 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`.
- 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
+```
This page took
0.022048 seconds
and
4
git commands to generate.