From: Jari Aalto <jari.aalto@xxxxxxxxx> Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> --- Documentation/git-am.txt | 133 +++++++++++++++++++++++----------------------- 1 files changed, 67 insertions(+), 66 deletions(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 51297d0..275ae8f 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -25,60 +25,42 @@ current branch. OPTIONS ------- -(<mbox>|<Maildir>)...:: - The list of mailbox files to read patches from. If you do not - supply this argument, the command reads from the standard input. - If you supply directories, they will be treated as Maildirs. - --s:: ---signoff:: - Add a `Signed-off-by:` line to the commit message, using - the committer identity of yourself. --k:: ---keep:: - Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). +-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. ---keep-cr:: ---no-keep-cr:: - With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) - with the same option, to prevent it from stripping CR at the end of - lines. `am.keepcr` configuration variable can be used to specify the - default behaviour. `--no-keep-cr` is useful to override `am.keepcr`. +--abort:: + Restore the original branch and abort the patching operation. -c:: --scissors:: +--no-scissors:: Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). ---no-scissors:: - Ignore scissors lines (see linkgit:git-mailinfo[1]). - --q:: ---quiet:: - Be quiet. Only print error messages. + Alternatively ignore scissors lines (see linkgit:git-mailinfo[1]). --u:: ---utf8:: - 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 - preferred encoding if it is not UTF-8). -+ -This was optional in prior versions of git, but now it is the -default. You can use `--no-utf8` to override this. +--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. ---no-utf8:: - Pass `-n` flag to 'git mailinfo' (see - linkgit:git-mailinfo[1]). +-i:: +--interactive:: + Run interactively. --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:: + 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. --ignore-date:: --ignore-space-change:: @@ -91,32 +73,24 @@ default. You can use `--no-utf8` to override this. These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch. +-k:: +--keep:: + Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). --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. +--keep-cr:: +--no-keep-cr:: + With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) + with the same option, to prevent it from stripping CR at the end of + lines. `am.keepcr` configuration variable can be used to specify the + default behaviour. `--no-keep-cr` is useful to override `am.keepcr`. ---skip:: - Skip the current patch. This is only meaningful when - restarting an aborted patch. +-q:: +--quiet:: + Be quiet. Only print error messages. ---continue:: -r:: --resolved:: +--continue:: 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. @@ -131,8 +105,35 @@ default. You can use `--no-utf8` to override this. 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. +-s:: +--signoff:: + Add a `Signed-off-by:` line to the commit message, using + the committer identity of yourself. + +-u:: +--utf8:: +--no-utf8:: + 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 + preferred encoding if it is not UTF-8). ++ +This was optional in prior versions of git, but now it is the +default. You can use `--no-utf8` to override this. + + With `--no-utf8', pass `-n` flag to 'git mailinfo' (see + linkgit:git-mailinfo[1]). + +--skip:: + Skip the current patch. This is only meaningful when + restarting an aborted patch. + +(<mbox>|<Maildir>)...:: + The list of mailbox files to read patches from. If you do not + supply this argument, the command reads from the standard input. + If you supply directories, they will be treated as Maildirs. + DISCUSSION ---------- -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html