Third batch for 2.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 21, 2016 at 14:57 UTC
1d1bdafd64266e5ee3bd46c6965228f32e4022ea
1 file changed
+40
Documentation/RelNotes/2.12.0.txt
+40
@@ -35,6 +35,14 @@ UI, Workflows & Features
35
remove the metadata left by an earlier "git rebase" that was
36
manually aborted without using "git rebase --abort".
37
38
+ * "git clone --reference $there --recurse-submodules $super" has been
39
+ taught to guess repositories usable as references for submodules of
40
+ $super that are embedded in $there while making a clone of the
41
+ superproject borrow objects from $there; extend the mechanism to
42
+ also allow submodules of these submodules to borrow repositories
43
+ embedded in these clones of the submodules embedded in the clone of
44
+ the superproject.
45
+
46
47
Performance, Internal Implementation, Development Support etc.
48
@@ -162,6 +170,38 @@ notes for details).
170
mergetool" has been modernized to match recent versions of xxdiff.
171
(merge 6cf5f6cef7 da/mergetool-xxdiff-hotkey later to maint).
172
173
+ * Unlike "git am --abort", "git cherry-pick --abort" moved HEAD back
174
+ to where cherry-pick started while picking multiple changes, when
175
+ the cherry-pick stopped to ask for help from the user, and the user
176
+ did "git reset --hard" to a different commit in order to re-attempt
177
+ the operation.
178
+ (merge ce73bb22d8 sb/sequencer-abort-safety later to maint).
179
+
180
+ * Code cleanup in shallow boundary computation.
181
+ (merge 649b0c316a nd/shallow-fixup later to maint).
182
+
183
+ * A recent update to receive-pack to make it easier to drop garbage
184
+ objects made it clear that GIT_ALTERNATE_OBJECT_DIRECTORIES cannot
185
+ have a pathname with a colon in it (no surprise!), and this in turn
186
+ made it impossible to push into a repository at such a path. This
187
+ has been fixed by introducing a quoting mechanism used when
188
+ appending such a path to the colon-separated list.
189
+ (merge 5e74824fac jk/quote-env-path-list-component later to maint).
190
+
191
+ * The function usage_msg_opt() has been updated to say "fatal:"
192
+ before the custom message programs give, when they want to die
193
+ with a message about wrong command line options followed by the
194
+ standard usage string.
195
+ (merge 87433261a4 jk/parseopt-usage-msg-opt later to maint).
196
+
197
+ * "git index-pack --stdin" needs an access to an existing repository,
198
+ but "git index-pack file.pack" to generate an .idx file that
199
+ corresponds to a packfile does not.
200
+ (merge 29401e1575 jk/index-pack-wo-repo-from-stdin later to maint).
201
+
202
+ * Fix for NDEBUG builds.
203
+ (merge 08414938a2 jt/mailinfo-fold-in-body-headers later to maint).
204
+
205
* Other minor doc, test and build updates and code cleanups.
206
(merge fa6ca11105 nd/qsort-in-merge-recursive later to maint).
207
(merge fa3142c919 ak/lazy-prereq-mktemp later to maint).