summaryrefslogtreecommitdiff
path: root/Documentation/git-svn.txt
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-11-16 02:57:16 (GMT)
committerEric Wong <normalperson@yhbt.net>2009-11-16 03:30:06 (GMT)
commit6111b934991f3ea670ac2442806c976defc7b61c (patch)
treecb892f1efc6601e63f640d6a51f222e89c60a08c /Documentation/git-svn.txt
parente2f8617b266e320fd58ab584cae2ebe9906daaac (diff)
downloadgit-6111b934991f3ea670ac2442806c976defc7b61c.zip
git-6111b934991f3ea670ac2442806c976defc7b61c.tar.gz
git-6111b934991f3ea670ac2442806c976defc7b61c.tar.bz2
git svn: attempt to create empty dirs on clone+rebase
We parse unhandled.log files for empty_dir statements and make a best effort attempt to recreate empty directories on fresh clones and rebase. This should cover the majority of cases where users work off a single branch or for projects where branches do not differ in empty directories. Since this cannot affect "normal" git commands like "checkout" or "reset", so users switching between branches in a single working directory should use the new "git svn mkdirs" command after switching branches. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'Documentation/git-svn.txt')
-rw-r--r--Documentation/git-svn.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 1812890..db00ed4 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/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