git-merge-repo #357
Merged
git-merge-repo #357
Conversation
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
| flat=1 | ||
| fi | ||
|
|
||
| git subtree add -P $prefix $repo $branch |
There was a problem hiding this comment.
Would you mind quoting the variables?
|
Please squash the commits, once merged, don't forget to update the wiki. |
|
done and done |
|
Sweet! 👍 |
tardypad
pushed a commit
to tardypad/git-extras
that referenced
this pull request
Jul 13, 2016
git-merge-repo
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This command merges two repo histories. There's an optional
--squashflag and an optional "flat merge" mode - if the incoming repo's directory is set to., then a squash-like commit is added for the files added to the current directory.