Merge branch 'maint'
commit11a264050f61bb15c413cced058db2ac96fd96f9
authorShawn O. Pearce <spearce@spearce.org>
Tue, 10 Jul 2007 01:28:27 +0000 (9 21:28 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 10 Jul 2007 01:28:27 +0000 (9 21:28 -0400)
treee8369f6e19c2d4dbbf693525f33c756b4c6664b2
parent1ed84157a21a3e868228b15588e4aadfbe5a030b
parent512e44b24501df0b4b231cc7f999f9646d96617b
Merge branch 'maint'

* maint:
  Clarify documentation of fast-import's D subcommand
Documentation/git-fast-import.txt