Skip to content

Commit

Permalink
git merge-repo
Browse files Browse the repository at this point in the history
  • Loading branch information
imsky committed Apr 19, 2015
1 parent 34c9a48 commit 28982cb
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion Commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
- [`git pr`](#git-pr)
- [`git root`](#git-root)
- [`git delta`](#git-delta)
- [`git merge-repo`](#git-merge-repo)

## git extras

Expand Down Expand Up @@ -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.

0 comments on commit 28982cb

Please sign in to comment.