Merge branch 'maint'

* maint:
Update draft release notes for 1.6.2.1

diff --git a/Documentation/RelNotes-1.6.2.1.txt b/Documentation/RelNotes-1.6.2.1.txt
index 3a2d3bf84954aaf35f0218d62b6ecc1f7bbae856..a33782d47cfcca1ccd30116af9996960f2634513 100644 (file)
--- a/Documentation/RelNotes-1.6.2.1.txt
+++ b/Documentation/RelNotes-1.6.2.1.txt
@@ -4,3 +4,22 @@ GIT v1.6.2.1 Release Notes
 Fixes since v1.6.2
 ------------------
 
+* .gitignore learned to handle backslash as a quoting mechanism for
+  comment introduction character "#".
+
+* timestamp output in --date=relative mode used to display timestamps that
+  are long time ago in the default mode; it now uses "N years M months
+  ago", and "N years ago".
+
+* git-add -i/-p now works with non-ASCII pathnames.
+
+* "git hash-object -w" did not read from the configuration file from the
+  correct .git directory.
+
+* git-send-email learned to correctly handle multiple Cc: addresses.
+
+---
+exec >/var/tmp/1
+O=v1.6.2-21-g7681ed2
+echo O=$(git describe maint)
+git shortlog --no-merges $O..maint

diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
index ee1fddb76a76e33b9b4dc684063a32433ca5d7b0..7f36b6c5c1d66dcb195370c0787b31944d1a1965 100644 (file)
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
@@ -80,23 +80,6 @@ release, unless otherwise noted.
 Here are fixes that this release has, but have not been backported to
 v1.6.2.X series.
 
-* .gitignore learned to handle backslash as a quoting mechanism for
-  comment introduction character "#" (backport by merging dd482ee if
-  needed).
-
-* timestamp output in --date=relative mode used to display timestamps that
-  are long time ago in the default mode; it now uses "N years M months
-  ago", and "N years ago" (backport by picking 10edf37 if needed).
-
-* git-add -i/-p now works with non-ASCII pathnames (backport by picking
-  8851f48 if needed).
-
-* "git hash-object -w" did not read from the configuration file from the
-  correct .git directory (backport by merging 272459a if needed).
-
-* git-send-email learned to correctly handle multiple Cc: addresses
-  (backport by merging afe756c if needed).
-
 ---
 exec >/var/tmp/1
 O=v1.6.2-77-g8cc3fe4