Man page - git-merge-into(1)
Packages contas this manual
- git-fork(1)
- git-count(1)
- git-get(1)
- git-changelog(1)
- git-gh-pages(1)
- git-mr(1)
- git-feature(1)
- git-browse(1)
- git-rename-remote(1)
- git-summary(1)
- git-commits-since(1)
- git-lock(1)
- git-ignore(1)
- git-clear-soft(1)
- git-unlock(1)
- git-touch(1)
- git-missing(1)
- git-authors(1)
- git-pull-request(1)
- git-repl(1)
- git-clear(1)
- git-guilt(1)
- git-reauthor(1)
- git-rename-file(1)
- git-delete-submodule(1)
- git-bulk(1)
- git-undo(1)
- git-delete-tag(1)
- git-root(1)
- git-show-unmerged-branches(1)
- git-archive-file(1)
- git-delete-squashed-branches(1)
- git-create-branch(1)
- git-show-tree(1)
- git-magic(1)
- git-rename-branch(1)
- git-merge-into(1)
- git-graft(1)
- git-coauthor(1)
- git-cp(1)
- git-rename-tag(1)
- git-browse-ci(1)
- git-extras(1)
- git-fresh-branch(1)
- git-rebase-patch(1)
- git-brv(1)
- git-force-clone(1)
- git-pr(1)
- git-effort(1)
- git-ignore-io(1)
- git-stamp(1)
- git-delete-merged-branches(1)
- git-info(1)
- git-alias(1)
- git-scp(1)
- git-setup(1)
- git-local-commits(1)
- git-paste(1)
- git-contrib(1)
- git-show-merged-branches(1)
- git-sync(1)
- git-reset-file(1)
- git-delta(1)
- git-obliterate(1)
- git-abort(1)
- git-psykorebase(1)
- git-merge-repo(1)
- git-squash(1)
- git-standup(1)
- git-delete-branch(1)
- git-locked(1)
- git-utimes(1)
- git-release(1)
- git-sed(1)
apt-get install git-extras
Manual
| GIT-MERGE-INTO(1) | Git Extras | GIT-MERGE-INTO(1) |
NAME
git-merge-into - Merge one branch into another
SYNOPSIS
git merge-into [src] <dest> [--ff-only]
DESCRIPTION
Merge one branch into another, and keep yourself on current branch. If src branch not given, it will merge current one to dest.
OPTIONS
<src>
The name of the branch will be merged into. If this not given, use current branch as default.
<dest>
The name of the branch to merge into.
--ff-only
Refuse to merge and exit with a non-zero status unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward.
EXAMPLES
Assume the following history exists and the current branch is src:
-
A---B---C src(current)
/
D---E---F---G dest
After running git merge-into dest, it will look like this:
-
A---B---C src(current)
/ \
D---E---F---G---H dest
The H commit will record the merge result, just like what git merge does. And src is still the current branch.
The default implementation of merge-into use git checkout and git merge, which may cause temporary change in the working tree. If you make sure your branch can be merged fast-forward, add --ff-only to avoid files change.
AUTHOR
Written by spacewander <spacewanderlzx@gmail.com>
REPORTING BUGS
<https://github.com/tj/git-extras/issues>
SEE ALSO
<https://github.com/tj/git-extras>
| October 2024 |