git-squash(1) -- Import changes from a branch ============================================= ## SYNOPSIS `git-squash` <source-branch|commit ref> [<commit-message>] ## DESCRIPTION Produce the working tree and index state as if a real merge happened without the commit or merge marks. ## OPTIONS <source-branch> Branch to squash on the current branch. <commit reference> A commit reference (has to be from the current branch) can also be used as the first argument. A range of commits ..HEAD will be squashed. <commit-message> If commit-message is given, commit the squash result. ## EXAMPLES $ git squash my-other-branch Updating a2740f5..533b19c Fast-forward Squash commit -- not updating HEAD my-changed-file | 1 + 1 file changed, 1 insertion(+) $ git commit -m "New commit without a real merge" $ git squash HEAD~3 "Commit message" ## AUTHOR Written by Jesús Espino <> ## REPORTING BUGS <> ## SEE ALSO <>