diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-18 07:39:28 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-18 07:39:28 +0000 |
commit | a5574469119a1d5e9f98cc629e1959eca9719ba9 (patch) | |
tree | 3c8b50314181da3654358104c116abb53efb563d /git-svn.txt | |
parent | e26ca7c58b61d66525bb2096c1b81505a5d64b67 (diff) | |
download | git-htmldocs-a5574469119a1d5e9f98cc629e1959eca9719ba9.tar.gz |
Autogenerated HTML docs for v1.6.5.3-171-ge36e
Diffstat (limited to 'git-svn.txt')
-rw-r--r-- | git-svn.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/git-svn.txt b/git-svn.txt index 1812890a7..4cdca0d87 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -320,6 +320,13 @@ Any other arguments are passed directly to 'git log' directories. The output is suitable for appending to the $GIT_DIR/info/exclude file. +'mkdirs':: + Attempts to recreate empty directories that core git cannot track + based on information in $GIT_DIR/svn/<refname>/unhandled.log files. + Empty directories are automatically recreated when using + "git svn clone" and "git svn rebase", so "mkdirs" is intended + for use after commands like "git checkout" or "git reset". + 'commit-diff':: Commits the diff of two tree-ish arguments from the command-line. This command does not rely on being inside an `git svn @@ -735,6 +742,16 @@ merges you've made. Furthermore, if you merge or pull from a git branch that is a mirror of an SVN branch, 'dcommit' may commit to the wrong branch. +If you do merge, note the following rule: 'git svn dcommit' will +attempt to commit on top of the SVN commit named in +------------------------------------------------------------------------ +git log --grep=^git-svn-id: --first-parent -1 +------------------------------------------------------------------------ +You 'must' therefore ensure that the most recent commit of the branch +you want to dcommit to is the 'first' parent of the merge. Chaos will +ensue otherwise, especially if the first parent is an older commit on +the same SVN branch. + 'git clone' does not clone branches under the refs/remotes/ hierarchy or any 'git svn' metadata, or config. So repositories created and managed with using 'git svn' should use 'rsync' for cloning, if cloning is to be done |