mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 09:56:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Alex Galvin 2024-08-14 20:03:10 +00:00 committed by Junio C Hamano
parent d7969a5127
commit be9bd463f1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/git-svn.txt
View File

@ -431,14 +431,14 @@ Any other arguments are passed directly to 'git log'
independently of 'git svn' functions. independently of 'git svn' functions.
'create-ignore':: 'create-ignore'::
Recursively finds the svn:ignore property on directories and Recursively finds the svn:ignore and svn:global-ignores properties
creates matching .gitignore files. The resulting files are staged to on directories and creates matching .gitignore files. The resulting
be committed, but are not committed. Use -r/--revision to refer to a files are staged to be committed, but are not committed. Use
specific revision. -r/--revision to refer to a specific revision.
'show-ignore':: 'show-ignore'::
Recursively finds and lists the svn:ignore property on Recursively finds and lists the svn:ignore and svn:global-ignores
directories. The output is suitable for appending to properties on directories. The output is suitable for appending to
the $GIT_DIR/info/exclude file. the $GIT_DIR/info/exclude file.
'mkdirs':: '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, # Now commit your changes (that were committed previously using Git) to SVN,
# as well as automatically updating your working HEAD: # as well as automatically updating your working HEAD:
git svn dcommit 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 git svn show-ignore >> .git/info/exclude
------------------------------------------------------------------------ ------------------------------------------------------------------------

6
git-svn.perl
View File

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