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 development histories together. It combines the specified commit and its history into the current branch, creating a merge commit when necessary.
Fast-forward merges move the branch pointer without creating a commit. Non-fast-forward merges create explicit merge commits. Squash merges combine all changes into one commit.
git merge is fundamental to branch-based workflows.

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)