summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-11 14:37:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-11 14:48:41 -0700
commit64621462deb307ba784aac82b05010f464c67f8e (patch)
tree3037852c9ca1de7cd9d3d15d4e5d9361e60c6bf3 /Documentation
parentMerge branch 'mg/maint-submodule-normalize-path' (diff)
parentUpdate draft release notes for 1.6.2.1 (diff)
downloadtgif-64621462deb307ba784aac82b05010f464c67f8e.tar.xz
Merge branch 'maint'
* maint: Update draft release notes for 1.6.2.1
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.6.2.1.txt19
-rw-r--r--Documentation/RelNotes-1.6.3.txt17
2 files changed, 19 insertions, 17 deletions
diff --git a/Documentation/RelNotes-1.6.2.1.txt b/Documentation/RelNotes-1.6.2.1.txt
index 3a2d3bf849..a33782d47c 100644
--- 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 ee1fddb76a..7f36b6c5c1 100644
--- 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