summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 11:29:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-11 11:29:02 -0700
commit0ef576d30888bb16158a9810aea3b7841396474d (patch)
tree4247ba81d789410055aec66b03aeea8a20eef7ad /Documentation
parentThe tenth batch of topics (diff)
parentGit 1.7.10.2 (diff)
downloadtgif-0ef576d30888bb16158a9810aea3b7841396474d.tar.xz
Sync with 1.7.10.2
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.10.2.txt14
-rw-r--r--Documentation/git-submodule.txt7
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/gitmodules.txt5
4 files changed, 22 insertions, 7 deletions
diff --git a/Documentation/RelNotes/1.7.10.2.txt b/Documentation/RelNotes/1.7.10.2.txt
index 55e960a54b..7a7e9d6fd1 100644
--- a/Documentation/RelNotes/1.7.10.2.txt
+++ b/Documentation/RelNotes/1.7.10.2.txt
@@ -14,6 +14,9 @@ Fixes since v1.7.10.1
* HTTP transport that requires authentication did not work correctly when
multiple connections are used simultaneously.
+ * Minor memory leak during unpack_trees (hence "merge" and "checkout"
+ to check out another branch) has been plugged.
+
* In the older days, the header "Conflicts:" in "cherry-pick" and "merge"
was separated by a blank line from the list of paths that follow for
readability, but when "merge" was rewritten in C, we lost it by
@@ -52,13 +55,24 @@ Fixes since v1.7.10.1
* "git push" over smart-http lost progress output a few releases ago;
this release resurrects it.
+ * The error and advice messages given by "git push" when it fails due
+ to non-ff were not very helpful to new users; it has been broken
+ into three cases, and each is given a separate advice message.
+
* The insn sheet given by "rebase -i" did not make it clear that the
insn lines can be re-ordered to affect the order of the commits in
the resulting history.
+ * "git repack" used to write out unreachable objects as loose objects
+ when repacking, even if such loose objects will immediately pruned
+ due to its age.
+
* A contrib script "rerere-train" did not work out of the box unless
user futzed with her $PATH.
+ * "git rev-parse --show-prefix" used to emit nothing when run at the
+ top-level of the working tree, but now it gives a blank line.
+
* The i18n of error message "git stash save" was not properly done.
* "git submodule" used a sed script that some platforms mishandled.
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index c243ee552b..c83a856574 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -140,7 +140,8 @@ update::
checkout the commit specified in the index of the containing repository.
This will make the submodules HEAD be detached unless `--rebase` or
`--merge` is specified or the key `submodule.$name.update` is set to
- `rebase`, `merge` or `none`.
+ `rebase`, `merge` or `none`. `none` can be overriden by specifying
+ `--checkout`.
+
If the submodule is not yet initialized, and you just want to use the
setting as stored in .gitmodules, you can automatically initialize the
@@ -148,10 +149,6 @@ submodule with the `--init` option.
+
If `--recursive` is specified, this command will recurse into the
registered submodules, and update any nested submodules within.
-+
-If the configuration key `submodule.$name.update` is set to `none` the
-submodule with name `$name` will not be updated by default. This can be
-overriden by adding `--checkout` to the command.
summary::
Show commit summary between the given commit (defaults to HEAD) and
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8527775988..c543213126 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.7.10.1/git.html[documentation for release 1.7.10.1]
+* link:v1.7.10.2/git.html[documentation for release 1.7.10.2]
* release notes for
+ link:RelNotes/1.7.10.2.txt[1.7.10.2],
link:RelNotes/1.7.10.1.txt[1.7.10.1],
link:RelNotes/1.7.10.txt[1.7.10].
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 4e1fd52e7d..4effd78902 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -41,8 +41,11 @@ submodule.<name>.update::
the commit specified in the superproject. If 'merge', the commit
specified in the superproject will be merged into the current branch
in the submodule.
+ If 'none', the submodule with name `$name` will not be updated
+ by default.
+
This config option is overridden if 'git submodule update' is given
- the '--merge' or '--rebase' options.
+ the '--merge', '--rebase' or '--checkout' options.
submodule.<name>.fetchRecurseSubmodules::
This option can be used to control recursive fetching of this