From 28982cbd2dce9030d1da218f56d0ce8152ce0f50 Mon Sep 17 00:00:00 2001 From: Ivan Malopinsky Date: Sun, 19 Apr 2015 11:15:33 -0400 Subject: [PATCH] git merge-repo --- Commands.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Commands.md b/Commands.md index 91d574e..50db3f9 100644 --- a/Commands.md +++ b/Commands.md @@ -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 -``` \ No newline at end of file +``` + +## 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. \ No newline at end of file