The sixth batch of topics graduated to 'master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 27, 2012 at 14:12 UTC
62bc83349d52be49b037d2c800a7f4064cfbc5b5
1 file changed
+24
Documentation/RelNotes/1.7.11.txt
+24
@@ -86,6 +86,30 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance
86
releases are contained in this release (see release notes to them for
87
details).
88
89
+ * Octopus merge strategy did not reduce heads that are recorded in the
90
+ final commit correctly.
91
+ (merge 5802f81 jc/merge-reduce-parents-early later to maint).
92
+
93
+ * In the older days, the header "Conflicts:" in "cherry-pick" and
94
+ "merge" was separated by a blank line from the list of paths that
95
+ follow for readability, but when "merge" was rewritten in C, we lost
96
+ it by mistake. Remove the newline from "cherry-pick" to make them
97
+ match again.
98
+ (merge 5112068 rt/cherry-revert-conflict-summary later to maint).
99
+
100
+ * The filesystem boundary was not correctly reported when .git
101
+ directory discovery stopped at a mount point.
102
+ (merge 2565b43 cb/maint-report-mount-point-correctly-in-setup later to maint).
103
+
104
+ * The command line parser choked "git cherry-pick $name" when $name
105
+ can be both revision name and a pathname, even though $name can
106
+ never be a path in the context of the command.
107
+ (merge 6d5b93f cb/cherry-pick-rev-path-confusion later to maint).
108
+
109
+ * HTTP transport that requires authentication did not work correctly
110
+ when multiple connections are used simultaneously.
111
+ (merge 6f4c347 cb/http-multi-curl-auth later to maint).
112
+
113
* The i18n of error message "git stash save" was not properly done.
114
(merge ed3c400 rl/maint-stash-i18n-save-error later to maint).
115