aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-20 21:47:06 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-20 21:47:06 -0700
commit451316d9bd9d117533cf32bb352bc370190075fc (patch)
tree4e2d5ed88c4d5dfd781bfb9b5c8e029c27fa6f8c /Documentation
parentb58f6b50c1032a8ac56ab09e99500d43da3919d1 (diff)
parentcb8a9bd518002dd4fb693df6230b4976bafc15e0 (diff)
downloadgit-451316d9bd9d117533cf32bb352bc370190075fc.tar.gz
git-451316d9bd9d117533cf32bb352bc370190075fc.tar.xz
Merge branch 'pb/send-email-cccmd-fix'
* pb/send-email-cccmd-fix: Test cccmd in t9001-send-email.sh and fix some bugs
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-send-email.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 9902da43c..fbde2d3be 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -193,12 +193,12 @@ Automating
- 'self' will avoid including the sender
- 'cc' will avoid including anyone mentioned in Cc lines in the patch header
except for self (use 'self' for that).
-- 'ccbody' will avoid including anyone mentioned in Cc lines in the
+- 'bodycc' will avoid including anyone mentioned in Cc lines in the
patch body (commit message) except for self (use 'self' for that).
- 'sob' will avoid including anyone mentioned in Signed-off-by lines except
for self (use 'self' for that).
- 'cccmd' will avoid running the --cc-cmd.
-- 'body' is equivalent to 'sob' + 'ccbody'
+- 'body' is equivalent to 'sob' + 'bodycc'
- 'all' will suppress all auto cc values.
--
+