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

NAME

6       stg-fold - Integrate a GNU diff patch into the current patch
7

SYNOPSIS

9       stg fold [options] [--] [<file>]
10

DESCRIPTION

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

OPTIONS

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       -C N
30           Ensure N lines of surrounding context for each change.
31
32       --reject
33           Leave the rejected hunks in corresponding *.rej files.
34

STGIT

36       Part of the StGit suite - see stg(1)
37
38
39
40StGit 1.5                         01/21/2023                       STG-FOLD(1)