stg-fold(1) — Linux manual page

STG-FOLD(1)                     StGit Manual                     STG-FOLD(1)

NAME top

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

SYNOPSIS top

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

DESCRIPTION top

       Apply the given GNU diff file (or the standard input) onto the top of
       the current patch. With the --threeway option, the patch is applied
       onto the bottom of the current patch and a three-way merge is
       performed with the current top. With the --base option, the patch is
       applied onto the specified base and a three-way merged is performed
       with the current top.

OPTIONS top

       -t, --threeway
           Perform a three-way merge with the current patch.

       -b BASE, --base BASE
           Use BASE instead of HEAD when applying the patch.

       -p N, --strip N
           Remove N leading slashes from diff paths (default 1).

       --reject
           Leave the rejected hunks in corresponding *.rej files.

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
       2020-08-13.  (At that time, the date of the most recent commit that
       was found in the repository was 2020-06-12.)  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                            08/13/2020                      STG-FOLD(1)