forked from tj/git-extras
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
18 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 [email protected]:tj/git-extras.git master . | ||
``` | ||
|
||
The above merges a remote repo's `master` branch into the current repository's directory, not preserving history. |