1STG-FOLD(1) StGit Manual STG-FOLD(1)
2
3
4
6 stg-fold - Integrate a GNU diff patch into the current patch
7
9 stg fold [options] [--] [<file>]
10
12 Apply the given GNU diff file (or the standard input) onto the top of
13 the current patch. With the --threeway option, the patch is applied
14 onto the bottom of the current patch and a three-way merge is performed
15 with the current top. With the --base option, the patch is applied onto
16 the specified base and a three-way merged is performed with the current
17 top.
18
20 -t, --threeway
21 Perform a three-way merge with the current patch.
22
23 -b BASE, --base BASE
24 Use BASE instead of HEAD when applying the patch.
25
26 -p N, --strip N
27 Remove N leading slashes from diff paths (default 1).
28
29 --reject
30 Leave the rejected hunks in corresponding *.rej files.
31
33 Part of the StGit suite - see stg(1)
34
35
36
37
38StGit 02/03/2019 STG-FOLD(1)