diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-21 14:42:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-21 14:42:30 -0700 |
| commit | 1af8bca79766198c591d8db58f778a98e96627e2 (patch) | |
| tree | 4095ac81dbabe081c9687d4ff3acb67608b36580 /git-am.sh | |
| parent | 9d880582ee0e63b3865350e90d3576fec55aed20 (diff) | |
| parent | 008442f5e798e511cc0cd5d9443552b0d107d558 (diff) | |
| download | git-1af8bca79766198c591d8db58f778a98e96627e2.tar.gz | |
Merge branch 'maint'
* maint:
git-am: fix typo in usage message
doc/git-daemon: s/uploadarchive/uploadarch/
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -11,7 +11,7 @@ git-am [options] --skip -- d,dotest= (removed -- do not use) 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) |