diff options
author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:17 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
commit | 0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6 (patch) | |
tree | 6c5654ff388c603eb020df9d8b4cd7acc2b3b862 /Documentation/git-am.txt | |
parent | 3771d002571f6fc796ff3f54e9d5b875826e62ed (diff) | |
download | git-0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6.tar.gz |
documentation: add missing article
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r-- | Documentation/git-am.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 51c2671515..00a5ec206d 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -94,7 +94,7 @@ OPTIONS Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). 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 project's + `i18n.commitEncoding` can be used to specify the project's preferred encoding if it is not UTF-8). + This was optional in prior versions of git, but now it is the @@ -192,7 +192,7 @@ include::rerere-options.txt[] --abort:: Restore the original branch and abort the patching operation. - Revert contents of files involved in the am operation to their + Revert the contents of files involved in the am operation to their pre-am state. --quit:: |