@@ -108,7 +108,28 @@ UI, Workflows & Features
108108 * Some people feel the default set of colors used by "git log --graph"
109109 rather limiting. A mechanism to customize the set of colors has
110110 been introduced.
111- (merge 512aba261a nd/log-graph-configurable-colors later to maint).
111+
112+ * "git read-tree" and its underlying unpack_trees() machinery learned
113+ to report problematic paths prefixed with the --super-prefix option.
114+
115+ * When a submodule "A", which has another submodule "B" nested within
116+ it, is "absorbed" into the top-level superproject, the inner
117+ submodule "B" used to be left in a strange state. The logic to
118+ adjust the .git pointers in these submodules has been corrected.
119+
120+ * The user can specify a custom update method that is run when
121+ "submodule update" updates an already checked out submodule. This
122+ was ignored when checking the submodule out for the first time and
123+ we instead always just checked out the commit that is bound to the
124+ path in the superproject's index.
125+
126+ * The command line completion (in contrib/) learned that
127+ "git diff --submodule=" can take "diff" as a recently added option.
128+
129+ * The "core.logAllRefUpdates" that used to be boolean has been
130+ enhanced to take 'always' as well, to record ref updates to refs
131+ other than the ones that are expected to be updated (i.e. branches,
132+ remote-tracking branches and notes).
112133
113134
114135Performance, Internal Implementation, Development Support etc.
@@ -129,13 +150,11 @@ Performance, Internal Implementation, Development Support etc.
129150
130151 * The codeflow of setting NOATIME and CLOEXEC on file descriptors Git
131152 opens has been simplified.
132- (merge b4d065df03 jc/git-open-cloexec later to maint).
133153
134154 * "git diff" and its family had two experimental heuristics to shift
135155 the contents of a hunk to make the patch easier to read. One of
136156 them turns out to be better than the other, so leave only the
137157 "--indent-heuristic" option and remove the other one.
138- (merge 3cde4e02ee jc/retire-compaction-heuristics later to maint).
139158
140159 * A new submodule helper "git submodule embedgitdirs" to make it
141160 easier to move embedded .git/ directory for submodules in a
@@ -162,7 +181,13 @@ Performance, Internal Implementation, Development Support etc.
162181 TravisCI.
163182
164183 * Rewrite a scripted porcelain "git difftool" in C.
165- (merge 94d3997ecc js/difftool-builtin later to maint).
184+
185+ * "make -C t failed" will now run only the tests that failed in the
186+ previous run. This is usable only when prove is not use, and gives
187+ a useless error message when run after "make clean", but otherwise
188+ is serviceable.
189+
190+ * "uchar [40]" to "struct object_id" conversion continues.
166191
167192
168193Also contains various documentation updates and code clean-ups.
@@ -374,7 +399,6 @@ notes for details).
374399 natively available, and a fallback implementation of it when not,
375400 to eliminate the need, which is a prerequisite for making the
376401 codepath reentrant.
377- (merge 83fc4d64fe rs/qsort-s later to maint).
378402
379403 * "git fsck --connectivity-check" was not working at all.
380404 (merge a2b22854bd jk/fsck-connectivity-check-fix later to maint).
@@ -411,7 +435,6 @@ notes for details).
411435 needs some changes to work with documents meant to be formatted
412436 with AsciiDoc. "make USE_ASCIIDOCTOR=YesPlease" to use it out of
413437 the box to document our pages is getting closer to reality.
414- (merge 55d2d812e4 bc/use-asciidoctor-opt later to maint).
415438
416439 * Other minor doc, test and build updates and code cleanups.
417440 (merge f2627d9b19 sb/submodule-config-cleanup later to maint).
0 commit comments