diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-30 18:06:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-30 18:06:39 -0800 |
| commit | e634aec752642dcf86c3fc82025e43381d6768c2 (patch) | |
| tree | a589b6756894d18c841ac61499e5d2c9beda36fd /Documentation/git-applymbox.txt | |
| parent | a1c7a69047e88244ed321b5aa2a8bcbba5a869c2 (diff) | |
| parent | 80e0c0ab91e1cf6a6315d0431bf6873ebbf8bef0 (diff) | |
| download | git-0.99.9a.tar.xz | |
GIT 0.99.9av0.99.9a
... to contain the RPM workaround.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-applymbox.txt')
| -rw-r--r-- | Documentation/git-applymbox.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index bb543788c0..f74c6a49b3 100644 --- a/Documentation/git-applymbox.txt +++ b/Documentation/git-applymbox.txt @@ -8,7 +8,7 @@ git-applymbox - Apply a series of patches in a mailbox SYNOPSIS -------- -'git-applymbox' [-u] [-k] [-q] ( -c .dotest/<num> | <mbox> ) [ <signoff> ] +'git-applymbox' [-u] [-k] [-q] [-m] ( -c .dotest/<num> | <mbox> ) [ <signoff> ] DESCRIPTION ----------- @@ -33,6 +33,14 @@ OPTIONS munging, and is most useful when used to read back 'git format-patch --mbox' output. +-m:: + Patches are applied with `git-apply` command, and unless + it cleanly applies without fuzz, the processing fails. + With this flag, if a tree that the patch applies cleanly + is found in a repository, the patch is applied to the + tree and then a 3-way merge between the resulting tree + and the current tree. + -u:: By default, the commit log message, author name and author email are taken from the e-mail without any @@ -67,7 +75,7 @@ OPTIONS SEE ALSO -------- -gitlink:git-applypatch[1]. +gitlink:git-am[1], gitlink:git-applypatch[1]. Author |