utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-10 07:26:17 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

git merge-repo

Browse source
This commit is contained in:
Ivan Malopinsky 2015-04-19 11:15:33 -04:00
parent 34c9a486bf
commit 28982cbd2d
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Commands.md
View file

@ -40,6 +40,7 @@
- [`git pr`](#git-pr)
- [`git root`](#git-root)
- [`git delta`](#git-delta)
- [`git merge-repo`](#git-merge-repo)
## git extras
@ -826,4 +827,20 @@ $ git add Makefile
$ git delta
Makefile
README.md
```
```
## git merge-repo
Merges two repository histories.
```bash
$ git merge-repo other-repo.git master new_dir
```
The above merges `other-repo.git`'s `master` branch into the current repository's `new_dir` directory.
```bash
$ git merge-repo git@github.com:tj/git-extras.git master .
```
The above merges a remote repo's `master` branch into the current repository's directory, not preserving history.