git-merge

Merge branch into current

$ git merge [branch-name]

$ git merge [branch] -m "[message]"

$ git merge --no-ff [branch]

$ git merge --squash [branch]

$ git merge --abort

git merge [options] [commit]

git merge joins two or more development histories together. It combines the specified branch and its history into the current branch, creating a merge commit when the histories have diverged.
Fast-forward merges simply move the branch pointer forward without creating a merge commit. The `--no-ff` flag forces a merge commit even when fast-forward is possible, preserving branch topology. Squash merges (`--squash`) combine all changes into a single staged changeset without creating a merge commit.

COMMIT

Branch or commit to merge.

Always create merge commit.

Only fast-forward merge.

Squash commits into one.

Merge commit message.

Abort current merge.

Continue after conflict resolution.

Merge strategy.

Display help information.

Conflicts require manual resolution. Fast-forward may hide branch history. Merge commits can complicate history.

git merge is a core Git command from initial release, implementing the branch combination essential to git's distributed workflow.

git-rebase(1), git-cherry-pick(1), git-mergetool(1)