git-svn: mention `svn:global-ignores` in help+docs

Git-SVN was previously taught to use the svn:global-ignores property as
well as svn:ignore when creating or showing .gitignore files from a
Subversion repository. However, the documentation and help message still
only mentioned svn:ignore. Update Git-SVN's documentation and help
command to mention support for the new property. Also capitalize the
help message for the 'mkdirs' command, for consistency.

Signed-off-by: Alex Galvin <agalvin@comqi.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 43c68c2ec44f6a055ade52f15c29e36dfed42b45..bcf7d84a87d1cc17358f3662c07b0e7adec0057f 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -431,14 +431,14 @@ Any other arguments are passed directly to 'git log'
        independently of 'git svn' functions.
 
 'create-ignore'::
-       Recursively finds the svn:ignore property on directories and
-       creates matching .gitignore files. The resulting files are staged to
-       be committed, but are not committed. Use -r/--revision to refer to a
-       specific revision.
+       Recursively finds the svn:ignore and svn:global-ignores properties
+       on directories and creates matching .gitignore files. The resulting
+       files are staged to be committed, but are not committed. Use
+       -r/--revision to refer to a specific revision.
 
 'show-ignore'::
-       Recursively finds and lists the svn:ignore property on
-       directories.  The output is suitable for appending to
+       Recursively finds and lists the svn:ignore and svn:global-ignores
+       properties on directories. The output is suitable for appending to
        the $GIT_DIR/info/exclude file.
 
 'mkdirs'::
@@ -871,7 +871,7 @@ Tracking and contributing to the trunk of a Subversion-managed project
 # Now commit your changes (that were committed previously using Git) to SVN,
 # as well as automatically updating your working HEAD:
        git svn dcommit
-# Append svn:ignore settings to the default Git exclude file:
+# Append svn:ignore and svn:global-ignores settings to the default Git exclude file:
        git svn show-ignore >> .git/info/exclude
 ------------------------------------------------------------------------
 

diff --git a/git-svn.perl b/git-svn.perl
index a2a46608c9bdaf130dfedd54307c3bc6e99579d6..01e7a70de1c0eb37b3feefe364ad78d4c8973097 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -219,11 +219,11 @@ my %cmd = (
                        "Set an SVN repository to a git tree-ish",
                        { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
        'create-ignore' => [ \&cmd_create_ignore,
-                            'Create a .gitignore per svn:ignore',
+                            "Create a .gitignore per directory with SVN ignore properties",
                             { 'revision|r=i' => \$_revision
                             } ],
        'mkdirs' => [ \&cmd_mkdirs ,
-                     "recreate empty directories after a checkout",
+                     "Recreate empty directories after a checkout",
                      { 'revision|r=i' => \$_revision } ],
         'propget' => [ \&cmd_propget,
                       'Print the value of a property on a file or directory',
@@ -234,7 +234,7 @@ my %cmd = (
         'proplist' => [ \&cmd_proplist,
                       'List all properties of a file or directory',
                       { 'revision|r=i' => \$_revision } ],
-       'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
+       'show-ignore' => [ \&cmd_show_ignore, "Show .gitignore patterns from SVN ignore properties",
                        { 'revision|r=i' => \$_revision
                        } ],
        'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",