These config options may be set to apply to all commands on the repository in lieu of providing the command-line options each time: svn.localtime: --localtime svn.useLogAuthor: --use-log-author svn.addAuthorFrom: --add-author-from Since these flags apply to multiple operations, it's easier to set them once rather than remembering to use them every time for every operation. Signed-off-by: Ted Percival <ted.percival@xxxxxxxxx> --- Documentation/git-svn.txt | 10 ++++++++++ git-svn.perl | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 34ee785..20f8edd 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -113,6 +113,9 @@ repository you cloned from, but if you wish for your local Git repository to be able to interoperate with someone else's local Git repository, either don't use this option or you should both use it in the same local timezone. ++ +[verse] +config key: svn.localtime --parent;; Fetch only from the SVN parent of the current HEAD. @@ -596,12 +599,19 @@ creating the branch or tag. When retrieving svn commits into git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line in the log message and use that as the author string. ++ +[verse] +config key: svn.useLogAuthor + --add-author-from:: When committing to svn from git (as part of 'commit-diff', 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by:` line, append a `From:` line based on the git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits. ++ +[verse] +config key: svn.addAuthorFrom ADVANCED OPTIONS diff --git a/git-svn.perl b/git-svn.perl index e30df22..d69b0d7 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -21,6 +21,9 @@ $Git::SVN::default_repo_id = 'svn'; $Git::SVN::default_ref_id = $ENV{GIT_SVN_ID} || 'git-svn'; $Git::SVN::Ra::_log_window_size = 100; $Git::SVN::_minimize_url = 'unset'; +$Git::SVN::_localtime = Git::config_bool('svn.localtime'); +$Git::SVN::_add_author_from = Git::config_bool('svn.addAuthorFrom'); +$Git::SVN::_use_log_author = Git::config_bool('svn.useLogAuthor'); if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) { $ENV{SVN_SSH} = $ENV{GIT_SSH}; -- 1.7.7.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html