diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-01-09 11:13:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-01-09 11:13:47 +0000 |
| commit | 1d3a6c7b01d9db283c9d0ababbd787b5ff9f48be (patch) | |
| tree | 2a020610bca9fcb87ee936e92b5cf5c31931f4cd /git-am.txt | |
| parent | d1204f020484ddc38d217617b12df424f17f8383 (diff) | |
| download | git-htmldocs-1d3a6c7b01d9db283c9d0ababbd787b5ff9f48be.tar.gz | |
Autogenerated HTML docs for v1.4.4.4-g1295
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/git-am.txt b/git-am.txt index 910457d3b..53e81cb10 100644 --- a/git-am.txt +++ b/git-am.txt @@ -9,7 +9,7 @@ git-am - Apply a series of patches in a mailbox SYNOPSIS -------- [verse] -'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] +'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way] [--interactive] [--whitespace=<option>] <mbox>... 'git-am' [--skip | --resolved] @@ -29,8 +29,21 @@ OPTIONS Instead of `.dotest` directory, use <dir> as a working area to store extracted patches. ---utf8, --keep:: - Pass `-u` and `-k` flags to `git-mailinfo` (see +--keep:: + Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]). + +--utf8:: + Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]). + The proposed commit log message taken from the e-mail + are 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 could use `--no-utf8` to override this. + +--no-utf8:: + Do not pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]). --binary:: |