aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-09 21:27:55 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-07-09 21:27:55 -0400
commit512e44b24501df0b4b231cc7f999f9646d96617b (patch)
treea8d3fa11a23f227a91ef32a8c0641b159469bd94 /Documentation
parentccd71866b0c7253f988c4836eeb888e4abcc2da1 (diff)
downloadgit-512e44b24501df0b4b231cc7f999f9646d96617b.tar.gz
git-512e44b24501df0b4b231cc7f999f9646d96617b.tar.xz
Clarify documentation of fast-import's D subcommand
The 'D' subcommand within a commit can also delete a directory recursively. This wasn't clear in the prior version of the documentation, leading to a question on the mailing list. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-fast-import.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 8d06775a6..87e70fe12 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -481,8 +481,9 @@ It is recommended that `<path>` always be encoded using UTF-8.
`filedelete`
^^^^^^^^^^^^
-Included in a `commit` command to remove a file from the branch.
-If the file removal makes its directory empty, the directory will
+Included in a `commit` command to remove a file or recursively
+delete an entire directory from the branch. If the file or directory
+removal makes its parent directory empty, the parent directory will
be automatically removed too. This cascades up the tree until the
first non-empty directory or the root is reached.
@@ -490,7 +491,8 @@ first non-empty directory or the root is reached.
'D' SP <path> LF
....
-here `<path>` is the complete path of the file to be removed.
+here `<path>` is the complete path of the file or subdirectory to
+be removed from the branch.
See `filemodify` above for a detailed description of `<path>`.
`filedeleteall`