diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-21 00:15:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-21 00:15:21 -0800 |
| commit | f1250edff5356cba7d8e71ec68418a4233b8bed0 (patch) | |
| tree | f4db547180350e555fb267c24f3badad21ef7911 /Documentation | |
| parent | 83c137928c77b83a3d5557bcff467cd020424442 (diff) | |
| parent | 2f8acdb38e513e4b983209563faf4c1d38c4013e (diff) | |
| download | git-f1250edff5356cba7d8e71ec68418a4233b8bed0.tar.gz git-f1250edff5356cba7d8e71ec68418a4233b8bed0.tar.xz | |
Merge branch 'jc/name' into next
* jc/name:
core.warnambiguousrefs: warns when "name" is used and both "name" branch and tag exists.
contrib/git-svn: allow rebuild to work on non-linear remote heads
http-push: don't assume char is signed
http-push: add support for deleting remote branches
Be verbose when !initial commit
Fix multi-paragraph list items in OPTIONS section
http-fetch: nicer warning for a server with unreliable 404 status
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cvsimport.txt | 27 | ||||
| -rw-r--r-- | Documentation/git-svnimport.txt | 25 |
2 files changed, 29 insertions, 23 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 57027b448..b0c6d7c30 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -99,21 +99,24 @@ If you need to pass multiple options, separate them with a comma. CVS by default uses the unix username when writing its commit logs. Using this option and an author-conv-file in this format - ++ +--------- exon=Andreas Ericsson <ae@op5.se> spawn=Simon Pawn <spawn@frog-pond.org> - git-cvsimport will make it appear as those authors had - their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly - all along. - - For convenience, this data is saved to $GIT_DIR/cvs-authors - each time the -A option is provided and read from that same - file each time git-cvsimport is run. - - It is not recommended to use this feature if you intend to - export changes back to CVS again later with - git-link[1]::git-cvsexportcommit. +--------- ++ +git-cvsimport will make it appear as those authors had +their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly +all along. ++ +For convenience, this data is saved to $GIT_DIR/cvs-authors +each time the -A option is provided and read from that same +file each time git-cvsimport is run. ++ +It is not recommended to use this feature if you intend to +export changes back to CVS again later with +git-link[1]::git-cvsexportcommit. OUTPUT ------ diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index 9d3865719..b1b87c2fc 100644 --- a/Documentation/git-svnimport.txt +++ b/Documentation/git-svnimport.txt @@ -75,18 +75,21 @@ When importing incrementally, you might need to edit the .git/svn2git file. -A <author_file>:: Read a file with lines on the form ++ +------ + username = User's Full Name <email@addr.es> - username = User's Full Name <email@addr.es> - - and use "User's Full Name <email@addr.es>" as the GIT - author and committer for Subversion commits made by - "username". If encountering a commit made by a user not in the - list, abort. - - For convenience, this data is saved to $GIT_DIR/svn-authors - each time the -A option is provided, and read from that same - file each time git-svnimport is run with an existing GIT - repository without -A. +------ ++ +and use "User's Full Name <email@addr.es>" as the GIT +author and committer for Subversion commits made by +"username". If encountering a commit made by a user not in the +list, abort. ++ +For convenience, this data is saved to $GIT_DIR/svn-authors +each time the -A option is provided, and read from that same +file each time git-svnimport is run with an existing GIT +repository without -A. -m:: Attempt to detect merges based on the commit message. This option |