summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-03 13:47:46 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-03 13:47:46 -0800
commitbc0fe84b064d2185e147b7c1f98bb6f9b7966b2c (patch)
treebe1e6f4d86c4e6265837953b4cbf1f0f3b23a7e3
parent54440e154f33678a80ea9f77085730b81a5e9446 (diff)
parentc07aa5b218b9f519c29b5be71fe43cd79365dd37 (diff)
downloadgit-bc0fe84b064d2185e147b7c1f98bb6f9b7966b2c.tar.gz
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7: docs: describe behavior of relative submodule URLs Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore
-rw-r--r--Documentation/git-read-tree.txt9
-rw-r--r--Documentation/git-submodule.txt7
-rw-r--r--perl/.gitignore1
3 files changed, 11 insertions, 6 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/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 6ec3fef079..b72964947a 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -79,7 +79,12 @@ to exist in the superproject. If <path> is not given, the
<repository> is the URL of the new submodule's origin repository.
This may be either an absolute URL, or (if it begins with ./
or ../), the location relative to the superproject's origin
-repository. If the superproject doesn't have an origin configured
+repository (Please note that to specify a repository 'foo.git'
+which is located right next to a superproject 'bar.git', you'll
+have to use '../foo.git' instead of './foo.git' - as one might expect
+when following the rules for relative URLs - because the evaluation
+of relative URLs in Git is identical to that of relative directories).
+If the superproject doesn't have an origin configured
the superproject is its own authoritative upstream and the current
working directory is used instead.
+
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