diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-11 21:37:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 21:48:41 (GMT) |
| commit | 64621462deb307ba784aac82b05010f464c67f8e (patch) | |
| tree | 3037852c9ca1de7cd9d3d15d4e5d9361e60c6bf3 | |
| parent | 500ff119682eaa6d5047b40e54688219a57716ca (diff) | |
| parent | c2aca7c40cff221b23a8b30eb8d4181e965f913d (diff) | |
| download | git-64621462deb307ba784aac82b05010f464c67f8e.zip git-64621462deb307ba784aac82b05010f464c67f8e.tar.gz git-64621462deb307ba784aac82b05010f464c67f8e.tar.bz2 | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.6.2.1
| -rw-r--r-- | Documentation/RelNotes-1.6.2.1.txt | 19 | ||||
| -rw-r--r-- | Documentation/RelNotes-1.6.3.txt | 17 |
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 3a2d3bf..a33782d 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 ee1fddb..7f36b6c 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 |