summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee8d52f)
raw | patch | inline | side by side (parent: ee8d52f)
author | Junio C Hamano <gitster@pobox.com> | |
Fri, 10 Feb 2012 22:15:38 +0000 (14:15 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 10 Feb 2012 22:16:32 +0000 (14:16 -0800) |
Document bunch of bugfix topics to be merged down to 'maint' soonish
for 1.7.9.1 maintenance release.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
for 1.7.9.1 maintenance release.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes/1.7.10.txt | patch | blob | history |
index 201e8d5786829ca604416e89b130762296b06324..e2559013566d3a503112f9ff8a1e3a08c171fe9c 100644 (file)
releases are contained in this release (see release notes to them for
details).
+ * "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).
+
+ * "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 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).
+
+ * Typo in "git branch --edit-description my-tpoic" was not diagnosed.
+ (merge c2d17ba jc/branch-desc-typoavoidance 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