Merge branch 'maint'

* maint:
  git-upload-pack: make sure we close unused pipe ends
  Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES.
  Documentation/git-svnimport.txt: fix typo.
This commit is contained in:
Junio C Hamano 2007-03-29 23:44:30 -07:00
commit e881192934
2 changed files with 9 additions and 9 deletions

View file

@ -265,14 +265,14 @@ its all parents.
Here are a handful examples: Here are a handful examples:
D A B D D G H D
D F A B C D F D F G H I J D F
^A G B D ^G D H D
^A F B C F ^D B E I J F B
G...I C D F G I B...C G H D E B C
^B G I C D F G I ^D B C E I J F B C
F^@ A B C C^@ I J F
F^! H D F H F^! D G H D F
Author Author
------ ------

View file

@ -27,7 +27,7 @@ repository, or incrementally import into an existing one.
SVN access is done by the SVN::Perl module. SVN access is done by the SVN::Perl module.
git-svnimport assumes that SVN repositories are organized into one git-svnimport assumes that SVN repositories are organized into one
"trunk" directory where the main development happens, "branch/FOO" "trunk" directory where the main development happens, "branches/FOO"
directories for branches, and "/tags/FOO" directories for tags. directories for branches, and "/tags/FOO" directories for tags.
Other subdirectories are ignored. Other subdirectories are ignored.