diff options
| author | Jeff King <peff@peff.net> | 2008-05-19 22:09:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-20 07:47:16 +0200 |
| commit | e77b0b5d0fdac411607dbae11ccad87dccd332d3 (patch) | |
| tree | 1139dadf9055ffb7e698257ceae00447166274d7 /git-am.sh | |
| parent | doc/git-daemon: s/uploadarchive/uploadarch/ (diff) | |
| download | git-e77b0b5d0fdac411607dbae11ccad87dccd332d3.tar.xz git-e77b0b5d0fdac411607dbae11ccad87dccd332d3.zip | |
git-am: fix typo in usage message
Signed-off-by: Jeff King <peff@peff.net>
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
@@ -10,7 +10,7 @@ git-am [options] --skip -- d,dotest= use <dir> and not .dotest i,interactive run interactively -b,binary pass --allo-binary-replacement to git-apply +b,binary pass --allow-binary-replacement to git-apply 3,3way allow fall back on 3way merging if needed s,signoff add a Signed-off-by line to the commit message u,utf8 recode into utf8 (default) |