From: Shawn O. Pearce <spearce@spearce.org>
Date: Tue, 10 Jul 2007 01:28:27 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc1~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/11a264050f61bb15c413cced058db2ac96fd96f9?ds=sidebyside;hp=-c

Merge branch 'maint'

* maint:
Clarify documentation of fast-import's D subcommand
---

11a264050f61bb15c413cced058db2ac96fd96f9
diff --combined Documentation/git-fast-import.txt
index 5eacab08dc,87e70fe12d..c66af7c876
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@@ -481,8 -481,9 +481,9 @@@ It is recommended that `<path>` always 
  
  `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 +491,8 @@@
  	'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`
@@@ -908,3 -910,4 +910,3 @@@ Documentation by Shawn O. Pearce <spear
  GIT
  ---
  Part of the gitlink:git[7] suite
 -