Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.1
  Merge accumulated fixes to prepare for 1.7.0.3
This commit is contained in:
Junio C Hamano
2010-03-08 01:26:55 -08:00
2 changed files with 55 additions and 3 deletions

View File

@@ -0,0 +1,34 @@
Git v1.7.0.3 Release Notes (draft)
==================================
Fixes since v1.7.0.2
--------------------
* Object files are created in a more ACL friendly way in repositories
where group permission is ACL controlled.
* "git add -i" didn't handle a deleted path very well.
* "git fetch --all/--multi" used to discard information for remotes that
are fetched earlier.
* "git log --author=me --grep=it" tried to find commits that have "it"
or are written by "me", instead of the ones that have "it" _and_ are
written by "me".
* "git mailinfo" (hence "git am") incorrectly removed initial indent from
paragraphs.
* "git prune" and "git reflog" (hence "git gc" as well) didn't honor
an instruction never to expire by setting gc.reflogexpire to never.
* "git push" misbehaved when branch.<name>.merge was configured without
matching branch.<name>.remote.
And other minor fixes and documentation updates.
--
exec >/var/tmp/1
echo O=$(git describe)
O=v1.7.0.2-53-g6eb3adf
git shortlog --no-merges $O..

View File

@@ -1,12 +1,30 @@
Git v1.7.1 Release Notes
========================
Git v1.7.1 Release Notes (draft)
================================
Updates since v1.7.0
--------------------
* "git cvsimport" learned -R option to leave revision mapping between
CVS revisions and resulting git commits.
* "git for-each-ref" learned %(symref), %(symref:short) and %(flag)
tokens.
* "git grep" learned "--no-index" option, to search inside contents that
are not managed by git.
* "git grep" learned --color=auto/always/never.
* "git hash-object --stdin-paths" can take "--no-filters" option now.
* "git request-pull" identifies the commit the request is relative to in
a more readable way.
* "git svn" should work better when interacting with repositories
with CRLF line endings.
* "git imap-send" learned to support CRAM-MD5 authentication.
Fixes since v1.7.0
------------------
@@ -16,5 +34,5 @@ release, unless otherwise noted.
---
exec >/var/tmp/1
echo O=$(git describe)
O=v1.7.0-36-gfaa3b47
O=v1.7.0.2-181-gc6830a3
git shortlog --no-merges ^maint $O..