diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-03 13:47:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-03 13:47:15 -0800 |
| commit | c07aa5b218b9f519c29b5be71fe43cd79365dd37 (patch) | |
| tree | c3e1686e95126b3d13e3eb4d8d38309441dba587 | |
| parent | 9e6ed475e7a8d39350f102f0730d321de08e0585 (diff) | |
| parent | 5c951ef47bf2e34dbde58bda88d430937657d2aa (diff) | |
| download | git-c07aa5b218b9f519c29b5be71fe43cd79365dd37.tar.gz | |
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
| -rw-r--r-- | Documentation/git-read-tree.txt | 9 | ||||
| -rw-r--r-- | perl/.gitignore | 1 |
2 files changed, 5 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=<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 9235e73163..d5c6e22d0f 100644 --- a/perl/.gitignore +++ b/perl/.gitignore @@ -1,5 +1,6 @@ perl.mak perl.mak.old +MYMETA.json MYMETA.yml blib blibdirs |