summaryrefslogtreecommitdiff
path: root/Documentation/git-am.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:53 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-29 13:18:53 -0800
commitbff64a9cdabee8476ad1d2e45f586a2d6a884363 (patch)
tree8e40ea0492651a36c7b615e19c04b500c152bf29 /Documentation/git-am.txt
parent1082fb22b236201ea71fcf5e262d48796992fe72 (diff)
parentee2d1cb402a7ccda0028b221f2252801b3cb7eef (diff)
downloadgit-bff64a9cdabee8476ad1d2e45f586a2d6a884363.tar.gz
Merge branch 'tr/maint-mailinfo'
* tr/maint-mailinfo: mailinfo: with -b, keep space after [foo] am: learn passing -b to mailinfo Conflicts: git-am.sh
Diffstat (limited to 'Documentation/git-am.txt')
-rw-r--r--Documentation/git-am.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 887466d777..ee6cca2e13 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -40,6 +40,9 @@ OPTIONS
--keep::
Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
+--keep-non-patch::
+ Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
+
--keep-cr::
--no-keep-cr::
With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1])