Documentation: talk about guts of merge in tutorial.

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index a2f97b392a6eb2c60289837d19af5ee2cdf42cc8..4b62256a79034c4dcd60e2954e7f5c1b7f3caa81 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
                        [ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
-                       [ -C <git_repository> ] [ -i ] [ -k ]
+                       [ -C <git_repository> ] [ -i ] [ -P <file> ] [ -k ]
                        [ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]