diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2007-04-17 08:28:11 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2007-04-17 08:28:11 +0000 |
commit | 0e3cb537e5dee1347d53fc91ed855a1e84127503 (patch) | |
tree | 96798e6364c62384423f5a2490c9630dfea97a60 /git-am.txt | |
parent | 29ee16327f63eaf6dfd0a3348669ea607e921032 (diff) | |
download | git-htmldocs-0e3cb537e5dee1347d53fc91ed855a1e84127503.tar.gz |
Autogenerated HTML docs for v1.5.1.1-135-gf948
Diffstat (limited to 'git-am.txt')
-rw-r--r-- | git-am.txt | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/git-am.txt b/git-am.txt index 148ce4056..f0405a35e 100644 --- a/git-am.txt +++ b/git-am.txt @@ -26,18 +26,18 @@ OPTIONS The list of mailbox files to read patches from. If you do not supply this argument, reads from the standard input. ---signoff:: +-s, --signoff:: Add `Signed-off-by:` line to the commit message, using the committer identity of yourself. ---dotest=<dir>:: +-d=<dir>, --dotest=<dir>:: Instead of `.dotest` directory, use <dir> as a working area to store extracted patches. ---keep:: +-k, --keep:: Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]). ---utf8:: +-u, --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 @@ -48,14 +48,14 @@ 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 + Pass `-n` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]). ---binary:: +-b, --binary:: Pass `--allow-binary-replacement` flag to `git-apply` (see gitlink:git-apply[1]). ---3way:: +-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 @@ -73,10 +73,10 @@ default. You could use `--no-utf8` to override this. These flags are passed to the `git-apply` program that applies the patch. ---interactive:: +-i, --interactive:: Run interactively, just like git-applymbox. ---resolved:: +-r, --resolved:: 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. @@ -84,6 +84,13 @@ default. You could use `--no-utf8` to override this. extracted from the e-mail message and the current index file, and continue. +--resolvemsg=<msg>:: + When a patch failure occurs, <msg> will be printed + 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`. + DISCUSSION ---------- |