mirror of https://github.com/CrimsonTome/tldr.git
git-merge-*: add page (#9386)
* git merge-into: add page * git merge-repo: add page * Apply suggestions for git-merge-into * Apply suggestions for git-merge-repopull/1/head
parent
fcadddc0b1
commit
f63e2da79b
|
@ -0,0 +1,13 @@
|
||||||
|
# git merge-into
|
||||||
|
|
||||||
|
> Merge one branch into another branch.
|
||||||
|
> Part of `git-extras`.
|
||||||
|
> More information: <https://github.com/tj/git-extras/blob/master/Commands.md#git-merge-into>.
|
||||||
|
|
||||||
|
- Merge a source branch into a specific destination branch:
|
||||||
|
|
||||||
|
`git merge-into {{source_branch}} {{destination_branch}}`
|
||||||
|
|
||||||
|
- Merge current branch into a specific destination branch:
|
||||||
|
|
||||||
|
`git merge-into {{destination_branch}}`
|
|
@ -0,0 +1,13 @@
|
||||||
|
# git merge-repo
|
||||||
|
|
||||||
|
> Merge two repository histories.
|
||||||
|
> Part of `git-extras`.
|
||||||
|
> More information: <https://github.com/tj/git-extras/blob/master/Commands.md#git-merge-repo>.
|
||||||
|
|
||||||
|
- Merge a repository's branch into the current repository's directory:
|
||||||
|
|
||||||
|
`git merge-repo {{path/to/repo}} {{branch_name}} {{path/to/directory}}`
|
||||||
|
|
||||||
|
- Merge a remote repository's branch into the current repository's directory, not preserving history:
|
||||||
|
|
||||||
|
`git merge-repo {{path/to/remote_repo}} {{branch_name}} .`
|
Loading…
Reference in New Issue