STG-FOLD(1) StGit Manual STG-FOLD(1)
stg-fold - Fold diff file into the current patch
stg fold [OPTIONS] [file]
Fold diff file into the current patch. The given GNU diff file (or standard input) is applied onto the current patch. With the --threeway option, the diff 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 diff is applied onto the specified base and a three-way merge is performed with the current top.
-t, --threeway Perform a three-way merge with the current patch -b <committish>, --base=<committish> Use <committish> instead of HEAD when applying the patch -p <n>, --strip=<n> Remove <n> leading components from diff paths (default 1) -C <n> Ensure <n> lines of matching context for each change --reject Leave rejected hunks in ".rej" files
Part of the StGit suite - see stg(1)
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 ⟨https://github.com/stacked-git/stgit.git⟩ on 2023-06-23. (At that time, the date of the most recent commit that was found in the repository was 2023-06-19.) 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 email@example.com StGit 2.3.0 06/23/2023 STG-FOLD(1)
Pages that refer to this page: stg(1)