mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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:
commit
e881192934
|
@ -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
|
||||||
------
|
------
|
||||||
|
|
|
@ -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.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue