Chapter 47: Git Patch

Estimated reading: 4 minutes 5 views

Parameter	Details
`<mbox>	<Maildir>`…
-s, –signoﬀ	Add a Signed-oﬀ-by: line to the commit message, using the committer identity of yourself.
-q, –quiet	Be quiet. Only print error messages.
-u, –utf8	Pass -u flag to git mailinfo. The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable i18n.commitencoding can be used to specify the project’s preferred encoding if it is not UTF-8). You can use –no-utf8 to override this.
–no-utf8	Pass -n flag to git mailinfo.
-3, –3way	When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally.
–ignore-date, –ignore-space-change, –ignore-whitespace, –whitespace=<option>, -C<n>, -p<n>, –directory=<dir>, –exclude=<path>, –include=<path>, –reject	These flags are passed to the git apply program that applies the patch.
–patch-format	By default, the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, stgit, stgit-series, and hg.
-i, –interactive	Run interactively.
–committer-date-is-author-date	By default, the command records the date from the e-mail message as the commit author date and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date.
–ignore-date	By default, the command records the date from the e-mail message as the commit author date and uses the time of commit creation as the committer date. This allows the user to lie about the author date by using the same value as the committer date.
–skip	Skip the current patch. This is only meaningful when restarting an aborted patch.
-S[<keyid>], –gpg-sign[=<keyid>]	GPG-sign commits.
–continue, -r, –resolved	After a patch failure (e.g., attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue.
–resolvemsg=<msg>	When a patch failure occurs, `<msg>` will be printed to the screen before exiting. This overrides the standard message informing you to use –continue or –skip to handle the failure. This is solely for internal use between git rebase and git am.
–abort	Restore the original branch and abort the patching operation.

git lol

Section 47.1: Creating a patch

To create a patch, follow these two steps:

Make your changes and commit them.
Run git format-patch <commit-reference> to convert all commits since the commit <commit-reference> (not including it) into patch files.

For example, if you want to generate patches from the latest two commits, use the command:

git format-patch HEAD~~

This will create two files, one for each commit since HEAD~~, named as:

0001-hello_world.patch
0002-beginning.patch

Section 47.2: Applying patches

To apply a patch file to your current working directory, you can use the command git apply some.patch. The changes from the .patch file will be applied but remain unstaged, requiring you to commit them.

To apply a patch as a commit along with its commit message, you can use the command:

git am some.patch

If you have multiple patch files and want to apply all of them to the tree, you can use the following command:

git am *.patch

Course Tonight

Did You Know?

Course Tonight

Chapter 47: Git Patch

Leave a Comment Cancel reply

CONTENTS