Merge branch 'maint'

spearce · spearce · commit 11a264050f61 · 2007-07-09T21:28:27.000-04:00
* maint:
  Clarify documentation of fast-import's D subcommand
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
@@ -481,16 +481,18 @@ 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.
 
 ....
 	'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`
