Skip to content
Snippets Groups Projects
Commit 29b159bd authored by Matt Mackall's avatar Matt Mackall
Browse files

merge with stable

parents 8b0e3a89 7f4cf938
No related branches found
No related tags found
No related merge requests found
......@@ -101,9 +101,10 @@
longest matching path applies, so line order does not matter.
The ``include`` directive causes a file, or all files under a
directory, to be included in the destination repository, and the
exclusion of all other files and directories not explicitly
included. The ``exclude`` directive causes files or directories to
directory, to be included in the destination repository. The default
if there are no ``include`` statements is to include everything.
If there are any ``include`` statements, nothing else is included.
The ``exclude`` directive causes files or directories to
be omitted. The ``rename`` directive renames a file or directory if
it is converted. To rename from a subdirectory into the root of
the repository, use ``.`` as the path to rename to.
......
......@@ -84,11 +84,12 @@
so line order does not matter.
The "include" directive causes a file, or all files under a directory, to
be included in the destination repository, and the exclusion of all other
files and directories not explicitly included. The "exclude" directive
causes files or directories to be omitted. The "rename" directive renames
a file or directory if it is converted. To rename from a subdirectory into
the root of the repository, use "." as the path to rename to.
be included in the destination repository. The default if there are no
"include" statements is to include everything. If there are any "include"
statements, nothing else is included. The "exclude" directive causes files
or directories to be omitted. The "rename" directive renames a file or
directory if it is converted. To rename from a subdirectory into the root
of the repository, use "." as the path to rename to.
The splicemap is a file that allows insertion of synthetic history,
letting you specify the parents of a revision. This is useful if you want
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment