summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 74190d2)
raw | patch | inline | side by side (parent: 74190d2)
author | Jeff King <peff@peff.net> | |
Mon, 19 May 2008 20:09:06 +0000 (16:09 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 20 May 2008 05:47:16 +0000 (22:47 -0700) |
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh | patch | blob | history |
diff --git a/git-am.sh b/git-am.sh
index 851f85eb55f2ea078991c083711d172db9db8d1b..4dce87bdff7763cdd6e9d73ed236e40a5b3ca34c 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
--
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)