STG-SQUASH(1)                   StGit Manual                   STG-SQUASH(1)

NAME         top

       stg-squash - Squash two or more patches into one

SYNOPSIS         top

       stg squash [options] [--] <patches>

DESCRIPTION         top

       Squash two or more patches, creating one big patch that contains all
       their changes. In more detail:

        1. Pop all the given patches, plus any other patches on top of them.

        2. Push the given patches in the order they were given on the
           command line.

        3. Squash the given patches into one big patch.

        4. Allow the user to edit the commit message of the new patch
           interactively.

        5. Push the other patches that were popped in step (1).
       Conflicts can occur whenever we push a patch; that is, in step (2)
       and (5). If there are conflicts, the command will stop so that you
       can resolve them.

OPTIONS         top

       -n NAME, --name NAME
           Name of squashed patch.

       -m MESSAGE, --message MESSAGE
           Use MESSAGE instead of invoking the editor.

       -f FILE, --file FILE
           Use the contents of FILE instead of invoking the editor. (If FILE
           is "-", write to stdout.)

       --save-template FILE
           Instead of running the command, just write the message template
           to FILE, and exit. (If FILE is "-", write to stdout.)

           When driving StGit from another program, it is often useful to
           first call a command with --save-template, then let the user edit
           the message, and then call the same command with --file.

       --no-verify
           This option bypasses the commit-msg hook.

STGIT         top

       Part of the StGit suite - see stg(1)

COLOPHON         top

       This page is part of the stgit (Stacked Git) project.  Information
       about the project can be found at ⟨http://www.procode.org/stgit/⟩.
       If you have a bug report for this manual page, see
       ⟨http://www.procode.org/stgit/⟩.  This page was obtained from the
       project's upstream Git repository ⟨http://repo.or.cz/stgit.git⟩ on
       2017-11-25.  (At that time, the date of the most recent commit that
       was found in the repository was 2017-10-14.)  If you discover any
       rendering problems in this HTML version of the page, or you believe
       there is a better or more up-to-date source for the page, or you have
       corrections or improvements to the information in this COLOPHON
       (which is not part of the original manual page), send a mail to
       man-pages@man7.org

StGit                            11/25/2017                    STG-SQUASH(1)

Pages that refer to this page: stg(1)

HTML rendering created 2018-02-02 by Michael Kerrisk, author of The Linux Programming Interface, maintainer of the Linux man-pages project. For details of in-depth Linux/UNIX system programming training courses that I teach, look here. Hosting by jambit GmbH.