RelNotes Update
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/Documentation/RelNotes-1.6.2.txt b/Documentation/RelNotes-1.6.2.txt
index 6ed3159..d3e9583 100644
--- a/Documentation/RelNotes-1.6.2.txt
+++ b/Documentation/RelNotes-1.6.2.txt
@@ -10,9 +10,17 @@
push running this release will issue a big warning when the
configuration variable is missing. Please refer to:
+ http://git.or.cz/gitwiki/GitFaq#non-bare
http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
-for more details on the transition plan.
+for more details on the reason why this change is needed and the
+transition plan.
+
+For a similar reason, "git push $there :$killed" to delete the branch
+$killed in a remote repository $there, if $killed branch is the current
+branch pointed at by its HEAD, gets a large warning. You can choose what
+should happen upon such a push by setting the configuration variable
+receive.denyDeleteCurrent in the receiving repository.
Updates since v1.6.1
@@ -40,8 +48,17 @@
* @{-1} is a way to refer to the last branch you were on. This is
accepted not only where an object name is expected, but anywhere
- a branch name is expected. E.g. "git branch --track mybranch @{-1}"
- "git rev-parse --symbolic-full-name @{-1}".
+ a branch name is expected and acts as if you typed the branch name.
+ E.g. "git branch --track mybranch @{-1}", "git merge @{-1}", and
+ "git rev-parse --symbolic-full-name @{-1}" would work as expected.
+
+* When refs/remotes/origin/HEAD points at a remote tracking branch that
+ has been pruned away, many git operations issued warning when they
+ internally enumerated the refs. We now warn only when you say "origin"
+ to refer to that pruned branch.
+
+* The location of .mailmap file can be configured, and its file format was
+ enhanced to allow mapping an incorrect e-mail field as well.
* "git add -p" learned 'g'oto action to jump directly to a hunk.
@@ -91,6 +108,9 @@
* "git fsck" now checks loose objects in alternate object stores, instead
of misreporting them as missing.
+* "git gc --prune" was resurrected to allow "git gc --no-prune" and
+ giving non-default expiration period e.g. "git gc --prune=now".
+
* "git grep -w" and "git grep" for fixed strings have been optimized.
* "git mergetool" learned -y(--no-prompt) option to disable prompting.
@@ -102,6 +122,8 @@
"git checkout" switches branches, taking the local changes while
switching to another commit.
+* "git submodule update" learned --no-fetch option.
+
* "git tag" learned --contains that works the same way as the same option
from "git branch".
@@ -140,6 +162,6 @@
--
exec >/var/tmp/1
-O=v1.6.1.3-371-gc19923a
+v1.6.2-rc0-89-gf7a2bdb
echo O=$(git describe master)
git shortlog --no-merges $O..master ^maint
