diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
| commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
| tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-am.txt | |
| parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
| download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-am.txt')
| -rw-r--r-- | git-am.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-am.txt b/git-am.txt index 67ad5da9c..c3e4f12c4 100644 --- a/git-am.txt +++ b/git-am.txt @@ -37,7 +37,7 @@ 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]). -c:: --scissors:: @@ -53,7 +53,7 @@ OPTIONS -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 @@ -63,7 +63,7 @@ This was optional in prior versions of git, but now it is the default. You can 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:: @@ -81,7 +81,7 @@ default. You can use `--no-utf8` to override this. -p<n>:: --directory=<dir>:: --reject:: - 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. @@ -121,7 +121,7 @@ default. You can 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'. --abort:: Restore the original branch and abort the patching operation. |