X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2FRelNotes-1.6.2.txt;h=ad060f4f8900dde20b66e1b6ef5b0187cdc82983;hb=f92f2038a5192ac5fc1bb4f38c49906aa45b3f1e;hp=f1bfa82749c3993270b64c7e86e64b1cf6572a76;hpb=621f1b4bcf40f1469fc59202248df35619e33c82;p=git.git

diff --git a/Documentation/RelNotes-1.6.2.txt b/Documentation/RelNotes-1.6.2.txt
index f1bfa8274..ad060f4f8 100644
--- a/Documentation/RelNotes-1.6.2.txt
+++ b/Documentation/RelNotes-1.6.2.txt
@@ -10,9 +10,17 @@ To ease the transition plan, the receiving repository of such a
 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
@@ -25,8 +33,9 @@ Updates since v1.6.1
 * gitweb updates, including a new patch view and RSS/Atom feed
   improvements.
 
-* (contrib) git.el updates for better XEmacs compatibility; vc-git.el
-  is not shiped with git anymore (it is part of official Emacs)
+* (contrib/emacs) git.el now has commands for checking out a branch,
+  creating a branch, cherry-picking and reverting commits; vc-git.el
+  is not shipped with git anymore (it is part of official Emacs).
 
 (performance)
 
@@ -37,12 +46,19 @@ Updates since v1.6.1
 
 * automatic typo correction works on aliases as well
 
-* Initial support for "git notes" implemented.
-
 * @{-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.
 
@@ -92,6 +108,9 @@ Updates since v1.6.1
 * "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.
@@ -103,6 +122,8 @@ Updates since v1.6.1
   "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".
 
@@ -129,6 +150,9 @@ v1.6.1.X series.
 * "git filter-branch" incorrectly tried to update a nonexistent work tree
   at the end when it is run in a bare repository.
 
+* "git gc" did not work if your repository was created with an ancient git
+  and never had any pack files in it before.
+
 * "git mergetool" used to ignore autocrlf and other attributes
   based content rewriting.
 
@@ -138,9 +162,3 @@ v1.6.1.X series.
 
 * "git -p cmd" when cmd is not a built-in one left the display in funny state
   when killed in the middle.
-
---
-exec >/var/tmp/1
-O=v1.6.1.3-371-gc19923a
-echo O=$(git describe master)
-git shortlog --no-merges $O..master ^maint