global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 18:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Update draft release notes to 1.7.10
  Update draft release notes to 1.7.9.1
This commit is contained in:
Junio C Hamano
2012-02-10 14:21:37 -08:00
parent 35cc89d1e2 b6b3b6a01f
commit 47fe2f2742
2 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Documentation/RelNotes/1.7.10.txt
View File

@@ -62,45 +62,30 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
releases are contained in this release (see release notes to them for
details).
* When "git push" fails to update any refs, the client side did not
report an error correctly to the end user.
(merge 5238cbf sp/smart-http-failure-to-push later to maint).
* "add -e" learned not to show a diff for an otherwise unmodified
submodule that only has uncommitted local changes in the patch
prepared by for the user to edit.
(merge 701825d js/add-e-submodule-fix later to maint).
* "git push -q" was not sufficiently quiet.
(merge d336572 cb/push-quiet later to maint).
* "rebase" and "commit --amend" failed to work on commits with ancient
timestamps near year 1970.
(merge 2c733fb jc/parse-date-raw later to maint).
* "git log --first-parent $pathspec" did not stay on the first parent
chain and veered into side branch from which the whole change to the
specified paths came.
(merge 36ed191 jc/maint-log-first-parent-pathspec later to maint).
* "git merge --ff-only $tag" failed because it cannot record the
required mergetag without creating a merge, but this is so common
operation for branch that is used _only_ to follow the upstream, so
it is allowed to fast-forward without recording the mergetag.
(merge b5c9f1c jc/merge-ff-only-stronger-than-signed-merge later to maint).
* Subprocesses spawned from various git programs were often left running
to completion even when the top-level process was killed.
(merge 10c6cdd cb/maint-kill-subprocess-upon-signal later to maint).
* Typo in "git branch --edit-description my-tpoic" was not diagnosed.
(merge c2d17ba jc/branch-desc-typoavoidance later to maint).
* "git mergetool" now gives an empty file as the common base version
to the backend when dealing with the "both sides added, differently"
case.
(merge ec245ba da/maint-mergetool-twoway later to maint).
* "git submodule add $path" forgot to recompute the name to be stored
in .gitmodules when the submodule at $path was once added to the
superproject and already initialized.
(merge 1017c1a jl/submodule-re-add later to maint).
* Using "git grep -l/-L" together with options -W or --break may not
make much sense as the output is to only count the number of hits
and there is no place for file breaks, but the latter options made
"-l/-L" to miscount the hits.
(merge 50dd0f2 tr/grep-l-with-decoration later to maint).
* When asking for a tag to be pulled, "request-pull" shows the name
of the tag prefixed with "tags/"
(merge 2ad9ba0 jc/maint-request-pull-for-tag later to maint).
* rpmbuild noticed an unpackaged but installed *.mo file and failed.
(merge 3a9f58c jn/rpm-spec later to maint).
---
exec >/var/tmp/1
O=v1.7.9-187-gdc347e9
O=v1.7.9-208-gee8d52f
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
echo

17
Documentation/RelNotes/1.7.9.1.txt
View File

@@ -7,6 +7,11 @@ Fixes since v1.7.9
* Subprocesses spawned from various git programs were often left running
to completion even when the top-level process was killed.
* Using "git grep -l/-L" together with options -W or --break may not
make much sense as the output is to only count the number of hits
and there is no place for file breaks, but the latter options made
"-l/-L" to miscount the hits.
* "git log --first-parent $pathspec" did not stay on the first parent
chain and veered into side branch from which the whole change to the
specified paths came.
@@ -16,4 +21,16 @@ Fixes since v1.7.9
* When "git push" fails to update any refs, the client side did not
report an error correctly to the end user.
* "git mergetool" now gives an empty file as the common base version
to the backend when dealing with the "both sides added, differently"
case.
* When asking for a tag to be pulled, "request-pull" did not show the
name of the tag prefixed with "tags/", which would have helped older
clients.
* "git submodule add $path" forgot to recompute the name to be stored
in .gitmodules when the submodule at $path was once added to the
superproject and already initialized.
Also contains minor fixes and documentation updates.