From: Junio C Hamano Date: Tue, 3 Jan 2012 21:47:15 +0000 (-0800) Subject: Merge branch 'maint-1.7.6' into maint-1.7.7 X-Git-Tag: v1.7.8.3~2^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c07aa5b218b9f519c29b5be71fe43cd79365dd37;hp=9e6ed475e7a8d39350f102f0730d321de08e0585;p=git.git 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 537554982..a43e87448 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -83,11 +83,10 @@ OPTIONS --prefix=/:: Keep the current index contents, and read the contents - of the named tree-ish under the directory at ``. The - original index file cannot have anything at the path - `` itself, nor anything in the `/` - directory. Note that the `/` value must end - with a slash. + of the named tree-ish under the directory at ``. + The command will refuse to overwrite entries that already + existed in the original index file. Note that the `/` + value must end with a slash. --exclude-per-directory=:: When running the command with `-u` and `-m` options, the diff --git a/perl/.gitignore b/perl/.gitignore index 9235e7316..d5c6e22d0 100644 --- a/perl/.gitignore +++ b/perl/.gitignore @@ -1,5 +1,6 @@ perl.mak perl.mak.old +MYMETA.json MYMETA.yml blib blibdirs