From 40a1530c07a6a720b6cfa52c6132274fac4e4112 Mon Sep 17 00:00:00 2001 From: Ray Chen Date: Wed, 20 Jul 2011 18:37:26 -0400 Subject: git-svn: New flag to emulate empty directories Adds a --preserve-empty-dirs flag to the clone operation that will detect empty directories in the remote Subversion repository and create placeholder files in the corresponding local Git directories. This allows "empty" directories to exist in the history of a Git repository. Also adds the --placeholder-file flag to control the name of any placeholder files created. Default value is ".gitignore". Signed-off-by: Ray Chen Acked-by: Eric Wong --- Documentation/git-svn.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Documentation/git-svn.txt') diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index ed5eca1fce..6d4e1893b2 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -157,6 +157,17 @@ Skip "branches" and "tags" of first level directories;; affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes. +--preserve-empty-dirs;; + Create a placeholder file in the local Git repository for each + empty directory fetched from Subversion. This includes directories + that become empty by removing all entries in the Subversion + repository (but not the directory itself). The placeholder files + are also tracked and removed when no longer necessary. + +--placeholder-filename=;; + Set the name of placeholder files created by --preserve-empty-dirs. + Default: ".gitignore" + 'rebase':: This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it. -- cgit v1.2.3