From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:06:35 +0000 (-0700)
Subject: Merge branch 'ap/git-svn-propset-doc' into maint
X-Git-Tag: v2.9.1~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7f223b108dfc81d6917b53aa2b3f8d062aa0508d?ds=inline;hp=-c

Merge branch 'ap/git-svn-propset-doc' into maint

"git svn propset" subcommand that was added in 2.3 days is
documented now.

* ap/git-svn-propset-doc:
git-svn: document the 'git svn propset' command
---

7f223b108dfc81d6917b53aa2b3f8d062aa0508d
diff --combined Documentation/git-svn.txt
index 90a70799e2,909e9eeab0..698a6685f6
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@@ -70,8 -70,8 +70,8 @@@ COMMAND
  --username=<user>;;
  	For transports that SVN handles authentication for (http,
  	https, and plain svn), specify the username.  For other
 -	transports (e.g. svn+ssh://), you must include the username in
 -	the URL, e.g. svn+ssh://foo@svn.bar.com/project
 +	transports (e.g. `svn+ssh://`), you must include the username in
 +	the URL, e.g. `svn+ssh://foo@svn.bar.com/project`
  --prefix=<prefix>;;
  	This allows one to specify a prefix which is prepended
  	to the names of remotes if trunk/branches/tags are
@@@ -174,9 -174,6 +174,9 @@@ Skip "branches" and "tags" of first lev
  	(including automatic fetches due to 'clone', 'dcommit',
  	'rebase', etc) on a given repository. '--ignore-paths' takes
  	precedence over '--include-paths'.
 ++
 +[verse]
 +config key: svn-remote.<name>.include-paths
  
  --log-window-size=<n>;;
  	Fetch <n> log entries per request when scanning Subversion history.
@@@ -282,9 -279,9 +282,9 @@@ first have already been pushed into SVN
  	Ask the user to confirm that a patch set should actually be sent to SVN.
  	For each patch, one may answer "yes" (accept this patch), "no" (discard this
  	patch), "all" (accept all patches), or "quit".
 -	+
 -	'git svn dcommit' returns immediately if answer is "no" or "quit", without
 -	committing anything to SVN.
 ++
 +'git svn dcommit' returns immediately if answer is "no" or "quit", without
 +committing anything to SVN.
  
  'branch'::
  	Create a branch in the SVN repository.
@@@ -459,6 -456,20 +459,20 @@@ Any other arguments are passed directl
  	Gets the Subversion property given as the first argument, for a
  	file.  A specific revision can be specified with -r/--revision.
  
+ 'propset'::
+ 	Sets the Subversion property given as the first argument, to the
+ 	value given as the second argument for the file given as the
+ 	third argument.
+ +
+ Example:
+ +
+ ------------------------------------------------------------------------
+ git svn propset svn:keywords "FreeBSD=%H" devel/py-tipper/Makefile
+ ------------------------------------------------------------------------
+ +
+ This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file
+ 'devel/py-tipper/Makefile'.
+ 
  'show-externals'::
  	Shows the Subversion externals.  Use -r/--revision to specify a
  	specific revision.
@@@ -748,7 -759,7 +762,7 @@@ svn-remote.<name>.rewriteUUID:
  
  svn-remote.<name>.pushurl::
  
 -	Similar to Git's 'remote.<name>.pushurl', this key is designed
 +	Similar to Git's `remote.<name>.pushurl`, this key is designed
  	to be used in cases where 'url' points to an SVN repository
  	via a read-only transport, to provide an alternate read/write
  	transport. It is assumed that both keys point to the same
@@@ -1034,8 -1045,6 +1048,8 @@@ listed below are allowed
  	url = http://server.org/svn
  	fetch = trunk/project-a:refs/remotes/project-a/trunk
  	branches = branches/*/project-a:refs/remotes/project-a/branches/*
 +	branches = branches/release_*:refs/remotes/project-a/branches/release_*
 +	branches = branches/re*se:refs/remotes/project-a/branches/*
  	tags = tags/*/project-a:refs/remotes/project-a/tags/*
  ------------------------------------------------------------------------
  
@@@ -1046,16 -1055,6 +1060,16 @@@ independent path component (surrounded 
  type of configuration is not automatically created by 'init' and
  should be manually entered with a text-editor or using 'git config'.
  
 +Also note that only one asterisk is allowed per word. For example:
 +
 +	branches = branches/re*se:refs/remotes/project-a/branches/*
 +
 +will match branches 'release', 'rese', 're123se', however
 +
 +	branches = branches/re*s*e:refs/remotes/project-a/branches/*
 +
 +will produce an error.
 +
  It is also possible to fetch a subset of branches or tags by using a
  comma-separated list of names within braces. For example: