git-squash(1)

1GIT-SQUASH(1)                     Git Extras                     GIT-SQUASH(1)
2
3
4

NAME

6       git-squash - Import changes from a branch
7

SYNOPSIS

9       git-squash   [<--squash-messages>]  <source-branch|commit  ref>  [<com‐
10       mit-message>]
11

DESCRIPTION

13       Produce the working tree and index state as if a  real  merge  happened
14       without the commit or merge marks.
15

OPTIONS

17       <source-branch>
18
19       Branch to squash on the current branch.
20
21       <commit  reference>  A  commit  reference  (has  to be from the current
22       branch) can also be used as the first  argument.  A  range  of  commits
23       sha..HEAD will be squashed.
24
25       <--squash-msg>
26
27       Commit  the squash result with the concatenated squashed committed mes‐
28       sages. This option can not be used together with <commit-message>.
29
30       <commit-message>
31
32       If commit-message is given, commit the squash result.
33

EXAMPLES

35       $ git squash my-other-branch
36       Updating a2740f5..533b19c
37       Fast-forward
38       Squash commit -- not updating HEAD
39        my-changed-file | 1 +
40        1 file changed, 1 insertion(+)
41       $ git commit -m "New commit without a real merge"
42
43       $ git squash HEAD~3 "Commit message"
44       $ git squash --squash-msg @~3
45

AUTHOR

47       Written by Jesús Espino <jespinog@gmail.com>
48

REPORTING BUGS

50       <https://github.com/tj/git-extras/issues>
51