projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a2f873
)
git-am: fix type in its usage string
author
Jörg Sommer
<joerg@alea.gnuu.de>
Sat, 2 Feb 2008 23:58:06 +0000
(
00:58
+0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 4 Feb 2008 00:01:27 +0000
(16:01 -0800)
Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de>
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 5f0f241ad0bb53960d5969df5445760633f87dbc..2ecebc45a93784f1ca377941cd9b96569b3ade1c 100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-14,7
+14,7
@@
b,binary pass --allo-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)
-k,keep pass -k flag
g
to git-mailinfo
+k,keep pass -k flag to git-mailinfo
whitespace= pass it through git-apply
C= pass it through git-apply
p= pass it through git-apply