Git Command Builder

Build git commands visually with explanations

Operation

command

$ git merge

Arguments

Branch*

Flags

--no-ffNo fast-forward

Always create a merge commit, even if fast-forward is possible

--ff-onlyFast-forward only

Refuse to merge unless the current HEAD is already up to date or can be fast-forwarded

--squashSquash

Combine all commits from the branch into a single commit

--no-commitNo commit

Perform the merge but don't auto-commit, allowing inspection

-sStrategy

Use the given merge strategy

-mMessage

Set the commit message for the merge commit

What this does

Join two or more development histories together. Integrates changes from the named branch into the current branch.

Quick reference

HEAD~1 = one commit before HEAD

HEAD~3 = three commits before HEAD

origin/main = remote main branch

@{u} = upstream tracking branch

-- file.txt = target specific file

Common recipes

Get Smarter About AI Dev

New tutorials, open-source projects, and deep dives on coding agents - delivered weekly.

One email per weekReal code, not theoryFree forever