diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-22 03:26:42 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-22 03:26:42 +0400 |
| commit | f7bff60de95951d2c82601350cb3771b347e83ee (patch) | |
| tree | 5c0e747a86d4990b4e5b7176cec670de620dabe8 /git-am.sh | |
| parent | 75a2f301676aefb85c4f67da613cad2405e77927 (diff) | |
| parent | d0bb13663000be47d83cbe53b6c4bdc8835625cb (diff) | |
Merge branch 'sn/doc-opt-notation' into maint
* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5,7 +5,7 @@ SUBDIRECTORY_OK=Yes OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ -git am [options] [<mbox>|<Maildir>...] +git am [options] [(<mbox>|<Maildir>)...] git am [options] (--resolved | --skip | --abort) -- i,interactive run interactively |