git merge

Branching

Join two or more development histories together

Options & Flags

Available options for this command

--no-ff

Create merge commit even if fast-forward

--squash

Squash commits

Examples

Common usage examples

Merge feature-x into current branch

git merge feature-x

Merge with merge commit

git merge --no-ff feature-x

Related Commands

You might also find these useful

git branch git rebase