← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-security

« back to all changes in this revision

Viewing changes to Documentation/git-am.txt

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-10-04 08:27:01 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20071004082701-rsd058ontoqz4i30
Tags: 1:1.5.3.4-1
http://bugs.debian.org/445188
new upstream point release (closes: #445188).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Documentation/git-am.txt
12
12
'git-am' [--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8]
13
13
         [--3way] [--interactive] [--binary]
14
14
         [--whitespace=<option>] [-C<n>] [-p<n>]
15
 
         <mbox>...
 
15
         <mbox>|<Maildir>...
16
16
'git-am' [--skip | --resolved]
17
17
 
18
18
DESCRIPTION
23
23
 
24
24
OPTIONS
25
25
-------
26
 
<mbox>...::
 
26
<mbox>|<Maildir>...::
27
27
        The list of mailbox files to read patches from. If you do not
28
 
        supply this argument, reads from the standard input.
 
28
        supply this argument, reads from the standard input. If you supply
 
29
        directories, they'll be treated as Maildirs.
29
30
 
30
31
-s, --signoff::
31
32
        Add `Signed-off-by:` line to the commit message, using
126
127
 
127
128
When initially invoking it, you give it names of the mailboxes
128
129
to crunch.  Upon seeing the first patch that does not apply, it
129
 
aborts in the middle, just like 'git-applymbox' does.  You can
130
 
recover from this in one of two ways:
 
130
aborts in the middle,.  You can recover from this in one of two ways:
131
131
 
132
132
. skip the current patch by re-running the command with '--skip'
133
133
  option.
144
144
 
145
145
SEE ALSO
146
146
--------
147
 
gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1].
 
147
gitlink:git-apply[1].
148
148
 
149
149
 
150
150
Author
158
158
GIT
159
159
---
160
160
Part of the gitlink:git[7] suite
161