diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
tree | 390507328a7564b65dc803683c34235700b97409 /git-am.txt | |
parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-am.txt')
-rw-r--r-- | git-am.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-am.txt b/git-am.txt index 1296b9117..3863eebce 100644 --- a/git-am.txt +++ b/git-am.txt @@ -35,11 +35,11 @@ OPTIONS -k:: --keep:: - Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). + Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). -u:: --utf8:: - Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). + 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 @@ -49,7 +49,7 @@ This was optional in prior versions of git, but now it is the default. You could use `--no-utf8` to override this. --no-utf8:: - Pass `-n` flag to `git-mailinfo` (see + Pass `-n` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). -3:: @@ -61,17 +61,17 @@ default. You could use `--no-utf8` to override this. -b:: --binary:: - Pass `--allow-binary-replacement` flag to `git-apply` + Pass `--allow-binary-replacement` flag to 'git-apply' (see linkgit:git-apply[1]). --whitespace=<option>:: - This flag is passed to the `git-apply` (see linkgit:git-apply[1]) + This flag is passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch. -C<n>:: -p<n>:: - These flags are passed to the `git-apply` (see linkgit:git-apply[1]) + These flags are passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies the patch. @@ -97,7 +97,7 @@ default. You could use `--no-utf8` to override this. to the screen before exiting. This overrides the standard message informing you to use `--resolved` or `--skip` to handle the failure. This is solely - for internal use between `git-rebase` and `git-am`. + for internal use between 'git-rebase' and 'git-am'. DISCUSSION ---------- |