mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-1.7.6' into maint-1.7.7

Browse Source 
* maint-1.7.6:
  Documentation: read-tree --prefix works with existing subtrees
  Add MYMETA.json to perl/.gitignore
This commit is contained in:
Junio C Hamano 2012-01-03 13:47:15 -08:00
commit c07aa5b218
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-read-tree.txt
View File

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

1
perl/.gitignore vendored
View File

@ -1,5 +1,6 @@
perl.mak perl.mak
perl.mak.old perl.mak.old
MYMETA.json
MYMETA.yml MYMETA.yml
blib blib
blibdirs blibdirs