1STG-SQUASH(1)                    StGit Manual                    STG-SQUASH(1)
2
3
4

NAME

6       stg-squash - Squash two or more patches into one
7

SYNOPSIS

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

DESCRIPTION

12       Squash two or more patches, creating one big patch that contains all
13       their changes. In more detail:
14
15
16        1. Pop all the given patches, plus any other patches on top of them.
17
18        2. Push the given patches in the order they were given on the command
19           line.
20
21        3. Squash the given patches into one big patch.
22
23        4. Allow the user to edit the commit message of the new patch
24           interactively.
25
26        5. Push the other patches that were popped in step (1).
27       Conflicts can occur whenever we push a patch; that is, in step (2) and
28       (5). If there are conflicts, the command will stop so that you can
29       resolve them.
30

OPTIONS

32       -n NAME, --name NAME
33           Name of squashed patch.
34
35       -m MESSAGE, --message MESSAGE
36           Use MESSAGE instead of invoking the editor.
37
38       -f FILE, --file FILE
39           Use the contents of FILE instead of invoking the editor. (If FILE
40           is "-", write to stdout.)
41
42       --save-template FILE
43           Instead of running the command, just write the message template to
44           FILE, and exit. (If FILE is "-", write to stdout.)
45
46           When driving StGit from another program, it is often useful to
47           first call a command with --save-template, then let the user edit
48           the message, and then call the same command with --file.
49
50       --no-verify
51           This option bypasses the commit-msg hook.
52

STGIT

54       Part of the StGit suite - see stg(1)
55
56
57
58
59StGit                             01/31/2020                     STG-SQUASH(1)