diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-15 15:52:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-15 15:52:40 -0700 |
| commit | e5c1650b2796aa40b3d27d7ab75a56b9246d34ab (patch) | |
| tree | 7b88a5aa66eca76257c84d1527d3f2226d3ec615 | |
| parent | f4e516834ecedffc330c9735a5665104f8488055 (diff) | |
| parent | 7733b279339f46d8a2c119ab2ff8d14f76adf2ad (diff) | |
| download | git-e5c1650b2796aa40b3d27d7ab75a56b9246d34ab.tar.gz | |
Merge branch 'vh/git-svn-doc' into maint
* vh/git-svn-doc:
git-svn.txt: small typeface improvements
git-svn.txt: move option descriptions
git-svn.txt: fix usage of --add-author-from
| -rw-r--r-- | Documentation/git-svn.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 30a67486d2..509dc03376 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 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 ---------------- |