From: Jeff King Date: Mon, 19 May 2008 20:09:06 +0000 (-0400) Subject: git-am: fix typo in usage message X-Git-Tag: v1.5.5.2^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e77b0b5d0fdac411607dbae11ccad87dccd332d3;p=git.git git-am: fix typo in usage message Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/git-am.sh b/git-am.sh index 851f85eb5..4dce87bdf 100755 --- a/git-am.sh +++ b/git-am.sh @@ -10,7 +10,7 @@ git-am [options] --skip -- d,dotest= use 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)