Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6:
  Documentation: read-tree --prefix works with existing subtrees
  Add MYMETA.json to perl/.gitignore

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 5375549820bd6b9fecf3540b1e60ae50e74da0e6..a43e87448ba035278b58b191ea7c1c04179985a6 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -83,11 +83,10 @@ OPTIONS
 
 --prefix=<prefix>/::
        Keep the current index contents, and read the contents
-       of the named tree-ish under the directory at `<prefix>`. The
-       original index file cannot have anything at the path
-       `<prefix>` itself, nor anything in the `<prefix>/`
-       directory.  Note that the `<prefix>/` value must end
-       with a slash.
+       of the named tree-ish under the directory at `<prefix>`.
+       The command will refuse to overwrite entries that already
+       existed in the original index file. Note that the `<prefix>/`
+       value must end with a slash.
 
 --exclude-per-directory=<gitignore>::
        When running the command with `-u` and `-m` options, the

diff --git a/perl/.gitignore b/perl/.gitignore
index 9235e73163204593379cdf6367133b5b503423c2..d5c6e22d0f74e075a49dd50cde6cbee5049a336c 100644 (file)
--- a/perl/.gitignore
+++ b/perl/.gitignore
@@ -1,5 +1,6 @@
 perl.mak
 perl.mak.old
+MYMETA.json
 MYMETA.yml
 blib
 blibdirs