@matheusbsbs / matheus-bagliano / commits / 5c19f244c3
Fork 0

Update git-am documentation

Documentation/git-am.txt missing several short versions of options. Added documentation for --resolvemsg=<msg> command-line option. Signed-off-by: Andrew Ruder <andy@aeruder.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Andrew Ruder committed Apr 16, 2007 at 02:21 UTC 5c19f244c3ca1ef5bf419bcc822c3b8184d24f8f
1 file changed +16 -9
Documentation/git-am.txt
+16 -9
@@ -26,18 +26,18 @@ OPTIONS
26 The list of mailbox files to read patches from. If you do not
27 supply this argument, reads from the standard input.
28
29 ---signoff::
29 +-s, --signoff::
30 Add `Signed-off-by:` line to the commit message, using
31 the committer identity of yourself.
32
33 ---dotest=<dir>::
33 +-d=<dir>, --dotest=<dir>::
34 Instead of `.dotest` directory, use <dir> as a working
35 area to store extracted patches.
36
37 ---keep::
37 +-k, --keep::
38 Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
39
40 ---utf8::
40 +-u, --utf8::
41 Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
42 The proposed commit log message taken from the e-mail
43 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
48 default. You could use `--no-utf8` to override this.
49
50 --no-utf8::
51 - Do not pass `-u` flag to `git-mailinfo` (see
51 + Pass `-n` flag to `git-mailinfo` (see
52 gitlink:git-mailinfo[1]).
53
54 ---binary::
54 +-b, --binary::
55 Pass `--allow-binary-replacement` flag to `git-apply`
56 (see gitlink:git-apply[1]).
57
58 ---3way::
58 +-3, --3way::
59 When the patch does not apply cleanly, fall back on
60 3-way merge, if the patch records the identity of blobs
61 it is supposed to apply to, and we have those blobs
@@ -73,10 +73,10 @@ default. You could use `--no-utf8` to override this.
73 These flags are passed to the `git-apply` program that applies
74 the patch.
75
76 ---interactive::
76 +-i, --interactive::
77 Run interactively, just like git-applymbox.
78
79 ---resolved::
79 +-r, --resolved::
80 After a patch failure (e.g. attempting to apply
81 conflicting patch), the user has applied it by hand and
82 the index file stores the result of the application.
@@ -84,6 +84,13 @@ default. You could use `--no-utf8` to override this.
84 extracted from the e-mail message and the current index
85 file, and continue.
86
87 +--resolvemsg=<msg>::
88 + When a patch failure occurs, <msg> will be printed
89 + to the screen before exiting. This overrides the
90 + standard message informing you to use `--resolved`
91 + or `--skip` to handle the failure. This is solely
92 + for internal use between `git-rebase` and `git-am`.
93 +
94 DISCUSSION
95 ----------
96