diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-05 06:24:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-05 06:24:19 (GMT) |
| commit | e8a285e553f8c6c04820a542b2a28816a9d62d3c (patch) | |
| tree | af3b7f1a10cae9c470ae77f3fde00979f2969a7a /Documentation/git-am.txt | |
| parent | 97a449ee3031e8d128190b7f53a21c7688f73ec9 (diff) | |
| parent | 8024d5961bf885245d8febcb189a8c71bb46b29f (diff) | |
| download | git-e8a285e553f8c6c04820a542b2a28816a9d62d3c.zip git-e8a285e553f8c6c04820a542b2a28816a9d62d3c.tar.gz git-e8a285e553f8c6c04820a542b2a28816a9d62d3c.tar.bz2 | |
Merge branch 'maint-1.6.5' into maint-1.6.6
* maint-1.6.5:
Remove extra '-' from git-am(1)
Diffstat (limited to 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 67ad5da..40178be 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -44,7 +44,7 @@ OPTIONS Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). ----no-scissors:: +--no-scissors:: Ignore scissors lines (see linkgit:git-mailinfo[1]). -q:: |