diff --git a/pages/common/git-merge-into.md b/pages/common/git-merge-into.md new file mode 100644 index 000000000..94e5d96bc --- /dev/null +++ b/pages/common/git-merge-into.md @@ -0,0 +1,13 @@ +# git merge-into + +> Merge one branch into another branch. +> Part of `git-extras`. +> More information: . + +- 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}}` diff --git a/pages/common/git-merge-repo.md b/pages/common/git-merge-repo.md new file mode 100644 index 000000000..5476f94a8 --- /dev/null +++ b/pages/common/git-merge-repo.md @@ -0,0 +1,13 @@ +# git merge-repo + +> Merge two repository histories. +> Part of `git-extras`. +> More information: . + +- 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}} .`