From 12d30657d411979af3ab9ca7139b5290340e4abb Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Mon, 25 Apr 2011 23:36:15 +0200 Subject: [PATCH 1/3] git-svn.txt: fix usage of --add-author-from The option '--add-author-from' is used in 'commit-diff', 'set-tree', and 'dcommit' subcommands. Signed-off-by: Valentin Haenel Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 30a67486d2..60af7f73f5 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -150,7 +150,7 @@ Skip "branches" and "tags" of first level directories;; dcommit operations), look for the first From: or Signed-off-by: line in the log message and use that as the author string. --add-author-from;; - When committing to svn from git (as part of commit or dcommit + 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 From c88d18fff82c66526136f7b2aebe578238841190 Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Tue, 26 Apr 2011 13:34:18 +0200 Subject: [PATCH 2/3] git-svn.txt: move option descriptions The options '---use-log-author' and '--add-author-from' are applicable to other subcommands except 'fetch' -- therefore move them from the 'fetch' section to the more general 'options' section. Signed-off-by: Valentin Haenel Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- Documentation/git-svn.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 60af7f73f5..0e0ca68ce7 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -145,17 +145,6 @@ Skip "branches" and "tags" of first level directories;; ------------------------------------------------------------------------ -- ---use-log-author;; - 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. ---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. - 'clone':: Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; @@ -572,6 +561,17 @@ repository that will be fetched from. For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag. +--use-log-author:: + 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. +--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. + ADVANCED OPTIONS ---------------- From 7733b279339f46d8a2c119ab2ff8d14f76adf2ad Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Tue, 26 Apr 2011 13:34:19 +0200 Subject: [PATCH 3/3] git-svn.txt: small typeface improvements Mark subcommand names as 'subcommand' to make them stand out. Signed-off-by: Valentin Haenel Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- Documentation/git-svn.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 0e0ca68ce7..509dc03376 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -562,14 +562,14 @@ For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag. --use-log-author:: - When retrieving svn commits into git (as part of fetch, rebase, or - dcommit operations), look for the first From: or Signed-off-by: line + 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. --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 + `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.