Sync with "maint"

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-08-16 14:23:43 -07:00
parent 50b68aeb39
commit 4bfe7cb666

View file

@ -74,58 +74,10 @@ Fixes since v1.7.6
Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are
included in this release. included in this release.
* "git checkout -b <branch>" sometimes wrote a bogus reflog entry,
causing later "git checkout -" fail.
(merge 71ee7fd jc/checkout-reflog-fix~1 later).
* "git diff --cc" learned to correctly ignore binary files.
(merge 0508fe5 jk/combine-diff-binary-etc later)
* "git fast-export" forgot to quote pathnames with unsafe characters
in its output.
(merge 6280dfd jk/fast-export-quote-path later)
* "git fetch" did not recurse into submodules in subdirectories.
(merge ea2d325 jl/maint-fetch-recursive-fix later)
* "git ls-tree" did not error out when asked to show a corrupt tree.
(merge 04f8925 js/ls-tree-error later)
* "git pull" without any argument left an extra whitespace after the
command name in its reflog.
(merge c98d1e4 oa/pull-reflog later)
* "git rebase -i -p" incorrectly dropped commits from side branches.
(merge 12bf828 aw/rebase-i-p later)
* "git reset [<commit>] paths..." did not reset the index entry correctly
for unmerged paths.
(merge ff00b682 jc/maint-reset-unmerged-path later)
* "git submodule add" did not allow a relative repository path when
the superproject did not have any default remote url.
(merge f22a17e8 jl/submodule-add-relurl-wo-upstream later)
* "git submodule foreach" failed to correctly give the standard input to
the user-supplied command it invoked.
(merge 4dca1aa bc/submodule-foreach-stdin-fix-1.7.4 later)
* "git submodule update --quiet" was not really quiet.
(merge 7e60407 jl/submodule-update-quiet later)
* submodules that the user has never showed interest in by running
"git submodule init" was incorrectly marked as interesting by "git
submodule sync".
(merge 2cd9de3 jc/submodule-sync-no-auto-vivify later)
* "git tag -l <glob>..." did not take multiple glob patterns from the
command line.
(merge 588d0e8 jk/tag-list-multiple-patterns later)
-- --
exec >/var/tmp/1 exec >/var/tmp/1
echo O=$(git describe master) echo O=$(git describe master)
O=v1.7.6-446-g0af53e1 O=v1.7.6-471-g50b68ae
git log --first-parent --oneline $O..master git log --first-parent --oneline $O..master
echo echo
git shortlog --no-merges ^maint ^$O master git shortlog --no-merges ^maint ^$O master