diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-04 22:39:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-04 22:39:54 -0800 |
| commit | be2fb164ec2ec6837428201390ebe30f6f8798b5 (patch) | |
| tree | e9f2528362945b928822504b9dc73d930be29e70 /Documentation/git-am.txt | |
| parent | t9119-git-svn-info.sh: test with svn 1.6.* as well (diff) | |
| parent | Update draft release notes to 1.7.0.2 (diff) | |
| download | tgif-be2fb164ec2ec6837428201390ebe30f6f8798b5.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.0.2
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 c66c565bbe..23864df8da 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:: |