aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-09 21:28:27 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-07-09 21:28:27 -0400
commit11a264050f61bb15c413cced058db2ac96fd96f9 (patch)
treee8369f6e19c2d4dbbf693525f33c756b4c6664b2 /Documentation
parent1ed84157a21a3e868228b15588e4aadfbe5a030b (diff)
parent512e44b24501df0b4b231cc7f999f9646d96617b (diff)
downloadgit-11a264050f61bb15c413cced058db2ac96fd96f9.tar.gz
git-11a264050f61bb15c413cced058db2ac96fd96f9.tar.xz
Merge branch 'maint'
* maint: Clarify documentation of fast-import's D subcommand
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 5eacab08d..c66af7c87 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`