diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-04 22:24:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-04 22:24:19 -0800 |
| commit | e8a285e553f8c6c04820a542b2a28816a9d62d3c (patch) | |
| tree | af3b7f1a10cae9c470ae77f3fde00979f2969a7a /Documentation | |
| parent | t3301-notes: insert a shbang line in ./fake_editor.sh (diff) | |
| parent | Remove extra '-' from git-am(1) (diff) | |
| download | tgif-e8a285e553f8c6c04820a542b2a28816a9d62d3c.tar.xz | |
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')
| -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 67ad5da9cc..40178be922 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:: |