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>
Alex Galvin committed
Aug 14, 2024 at 20:03 UTC
be9bd463f16a18d8c8b0da2112a9c42b6a5e160d
2 files changed
+10
-10
Documentation/git-svn.txt
+7
-7
@@ -431,14 +431,14 @@ Any other arguments are passed directly to 'git log'
431
independently of 'git svn' functions.
432
433
'create-ignore'::
434
- Recursively finds the svn:ignore property on directories and
435
- creates matching .gitignore files. The resulting files are staged to
436
- be committed, but are not committed. Use -r/--revision to refer to a
437
- specific revision.
434
+ Recursively finds the svn:ignore and svn:global-ignores properties
435
+ on directories and creates matching .gitignore files. The resulting
436
+ files are staged to be committed, but are not committed. Use
437
+ -r/--revision to refer to a specific revision.
438
439
'show-ignore'::
440
- Recursively finds and lists the svn:ignore property on
441
- directories. The output is suitable for appending to
440
+ Recursively finds and lists the svn:ignore and svn:global-ignores
441
+ properties on directories. The output is suitable for appending to
442
the $GIT_DIR/info/exclude file.
443
444
'mkdirs'::
@@ -871,7 +871,7 @@ Tracking and contributing to the trunk of a Subversion-managed project
871
# Now commit your changes (that were committed previously using Git) to SVN,
872
# as well as automatically updating your working HEAD:
873
git svn dcommit
874
-# Append svn:ignore settings to the default Git exclude file:
874
+# Append svn:ignore and svn:global-ignores settings to the default Git exclude file:
875
git svn show-ignore >> .git/info/exclude
876
------------------------------------------------------------------------
877
git-svn.perl
+3
-3
@@ -219,11 +219,11 @@ my %cmd = (
219
"Set an SVN repository to a git tree-ish",
220
{ 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
221
'create-ignore' => [ \&cmd_create_ignore,
222
- 'Create a .gitignore per svn:ignore',
222
+ "Create a .gitignore per directory with SVN ignore properties",
223
{ 'revision|r=i' => \$_revision
224
} ],
225
'mkdirs' => [ \&cmd_mkdirs ,
226
- "recreate empty directories after a checkout",
226
+ "Recreate empty directories after a checkout",
227
{ 'revision|r=i' => \$_revision } ],
228
'propget' => [ \&cmd_propget,
229
'Print the value of a property on a file or directory',
@@ -234,7 +234,7 @@ my %cmd = (
234
'proplist' => [ \&cmd_proplist,
235
'List all properties of a file or directory',
236
{ 'revision|r=i' => \$_revision } ],
237
- 'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
237
+ 'show-ignore' => [ \&cmd_show_ignore, "Show .gitignore patterns from SVN ignore properties",
238
{ 'revision|r=i' => \$_revision
239
} ],
240
'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",