summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-28 13:13:53 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-28 13:13:53 -0700
commit0f3d855efc2f8104bb3e168dd3f74bc84e0d2d45 (patch)
tree32ec37cc330d9528778f0403756ed06158251a5f /Documentation
parentb8307836d2ce84fb4201a20955c78a3f472bb9fa (diff)
parentc0071ae5dc1c610ab3791ece7ccf7d4772fde151 (diff)
downloadgit-0f3d855efc2f8104bb3e168dd3f74bc84e0d2d45.tar.gz
Merge branch 'master' of git://git.bogomips.org/git-svn
* 'master' of git://git.bogomips.org/git-svn: git-svn: allow --version to work anywhere git-svn: document svn.authorsProg in config
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-svn.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 7e17cade7f..5f9e65b0c4 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -625,6 +625,9 @@ config key: svn.authorsfile
with the committer name as the first argument. The program is
expected to return a single line of the form "Name <email>",
which will be treated as if included in the authors file.
++
+[verse]
+config key: svn.authorsProg
-q::
--quiet::