From 0eddcbf1612ed044de586777b233caf8016c6e70 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Wed, 28 Dec 2011 22:42:05 -0600 Subject: [PATCH 1/2] Add MYMETA.json to perl/.gitignore ExtUtils::MakeMaker generates MYMETA.json in addition to MYMETA.yml since version 6.57_07. As it suggests, it is just meta information about the build and is cleaned up with 'make clean', so it should be ignored. Signed-off-by: Jack Nagel Signed-off-by: Junio C Hamano --- perl/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/perl/.gitignore b/perl/.gitignore index 9235e73163..d5c6e22d0f 100644 --- a/perl/.gitignore +++ b/perl/.gitignore @@ -1,5 +1,6 @@ perl.mak perl.mak.old +MYMETA.json MYMETA.yml blib blibdirs From 5c951ef47bf2e34dbde58bda88d430937657d2aa Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sat, 31 Dec 2011 12:50:56 +0100 Subject: [PATCH 2/2] Documentation: read-tree --prefix works with existing subtrees Since 34110cd4 (Make 'unpack_trees()' have a separate source and destination index) it is no longer true that a subdirectory with the same prefix must not exist. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano --- Documentation/git-read-tree.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 5375549820..a43e87448b 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