diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-21 17:16:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-21 17:16:10 -0700 |
| commit | d4c436975214d8f94d38f9be0ef709b4714fc821 (patch) | |
| tree | ae0ecf02aedd1340a02cb3d9e9b479629e8dcd70 /git-am.sh | |
| parent | 1bb28d87e1d8897db662f48455d369860758fbdd (diff) | |
| parent | 8a90438506d3b7c8ef8bd802b7ed10c1f12da1d0 (diff) | |
| download | git-d4c436975214d8f94d38f9be0ef709b4714fc821.tar.gz git-d4c436975214d8f94d38f9be0ef709b4714fc821.tar.xz | |
Sync with 1.7.3.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 |