From: "Alex Galvin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Alex Galvin <agalvin@comqi.com>, Alex Galvin <alex.v.galvin@gmail.com>
Subject: [PATCH] git-svn: mention `svn:globalignores` in help+docs
Date: Mon, 12 Aug 2024 22:06:23 +0000 [thread overview]
Message-ID: <pull.1766.git.git.1723500383989.gitgitgadget@gmail.com> (raw)
From: Alex Galvin <alex.v.galvin@gmail.com>
Git-SVN was previously taught to use the svn:globalignores attribute
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. This commit updates Git-SVN's
documentation and help command to mention the newly supported attribute.
Signed-off-by: Alex Galvin <alex.v.galvin@gmail.com>
---
git-svn: mention svn:globalignores in help+docs
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1766%2Fav-gal%2Fgit-svn-doc-globalignores-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1766/av-gal/git-svn-doc-globalignores-v1
Pull-Request: https://github.com/git/git/pull/1766
Documentation/git-svn.txt | 14 +++++++-------
git-svn.perl | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 43c68c2ec44..af69b07caf0 100644
--- 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:globalignores 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:globalignores
+ 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:globalignores 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 a2a46608c9b..f3d8cf2c2c1 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -219,7 +219,7 @@ 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 and svn:globalignores',
{ 'revision|r=i' => \$_revision
} ],
'mkdirs' => [ \&cmd_mkdirs ,
@@ -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 svn:ignore and svn:globalignores listings",
{ 'revision|r=i' => \$_revision
} ],
'show-externals' => [ \&cmd_show_externals, "Show svn:externals listings",
base-commit: cabe67c0d1819fd1e33079e92615c6c7a3dc560d
--
gitgitgadget
next reply other threads:[~2024-08-12 22:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 22:06 Alex Galvin via GitGitGadget [this message]
2024-08-13 17:36 ` [PATCH] git-svn: mention `svn:globalignores` in help+docs Junio C Hamano
2024-08-13 19:05 ` Alex Galvin
2024-08-13 19:55 ` [PATCH v2] git-svn: mention `svn:global-ignores` " Alex Galvin via GitGitGadget
2024-08-13 22:33 ` Junio C Hamano
2024-08-14 17:53 ` Alex Galvin
2024-08-14 18:55 ` Junio C Hamano
2024-08-14 20:03 ` [PATCH v3] " Alex Galvin via GitGitGadget
2024-08-14 22:12 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1766.git.git.1723500383989.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=agalvin@comqi.com \
--cc=alex.v.galvin@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).