summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-15 01:51:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-15 01:51:50 (GMT)
commite8a1a11d4e0036a4205dbed533c135b51cd87218 (patch)
tree4620e06dff129a2e40c83f7746a2cafe1ae49aca /Documentation
parent756e3ee0c62b44bd700ffb2d58c371b45ea4598e (diff)
parent0a48a344c6a886fee7f4e6d88e8ac5d5317ad8eb (diff)
downloadgit-e8a1a11d4e0036a4205dbed533c135b51cd87218.zip
git-e8a1a11d4e0036a4205dbed533c135b51cd87218.tar.gz
git-e8a1a11d4e0036a4205dbed533c135b51cd87218.tar.bz2
Merge branch 'kh/svn'
* kh/svn: git-svnimport: -r adds svn revision number to commit messages
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-svnimport.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index 63e28b8..5c543d5 100644
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -61,6 +61,10 @@ When importing incrementally, you might need to edit the .git/svn2git file.
the git repository. Use this option if you want to import into a
different branch.
+-r::
+ Prepend 'rX: ' to commit messages, where X is the imported
+ subversion revision.
+
-m::
Attempt to detect merges based on the commit message. This option
will enable default regexes that try to capture the name source