@@ -59,6 +59,16 @@ Performance, Internal Implementation, Development Support etc.
5959
6060 * Conversion from uchar[20] to struct object_id continues.
6161
62+ * Code cleanup.
63+ (merge 62a24c8923 rs/hex-to-bytes-cleanup later to maint).
64+
65+ * A single-word "unsigned flags" in the diff options is being split
66+ into a structure with many bitfields.
67+ (merge 0d1e0e7801 bw/diff-opt-impl-to-bitfields later to maint).
68+
69+ * TravisCI build updates.
70+ (merge c2154953b8 sg/travis-fixes later to maint).
71+
6272
6373Also contains various documentation updates and code clean-ups.
6474
@@ -122,5 +132,35 @@ Fixes since v2.15
122132 * Command line completion (in contrib/) update.
123133 (merge 6357d9d004 tb/complete-checkout later to maint).
124134
135+ * Description of blame.{showroot,blankboundary,showemail,date}
136+ configuration variables have been added to "git config --help".
137+ (merge de0bc11d13 sb/blame-config-doc later to maint).
138+
139+ * After an error from lstat(), diff_populate_filespec() function
140+ sometimes still went ahead and used invalid data in struct stat,
141+ which has been fixed.
142+ (merge 10e0ca843d ao/diff-populate-filespec-lstat-errorpath-fix later to maint).
143+
144+ * UNC paths are also relevant in Cygwin builds and they are now
145+ tested just like Mingw builds.
146+ (merge f21d60b429 ad/5580-unc-tests-on-cygwin later to maint).
147+
148+ * Correct start-up sequence so that a repository could be placed
149+ immediately under the root directory again (which was broken at
150+ around Git 2.13).
151+ (merge fa4d8c783d js/early-config later to maint).
152+
153+ * The credential helper for libsecret (in contrib/) has been improved
154+ to allow possibly prompting the end user to unlock secrets that are
155+ currently locked (otherwise the secrets may not be loaded).
156+ (merge 9c109e9bbc dk/libsecret-unlock-to-load-fix later to maint).
157+
158+ * MinGW updates.
159+ (merge 39bb86b4e5 js/mingw-full-version-in-resources later to maint).
160+ (merge 601e1e7897 js/wincred-empty-cred later to maint).
161+ (merge b2f55717c7 js/mingw-redirect-std-handles later to maint).
162+
125163 * Other minor doc, test and build updates and code cleanups.
126164 (merge bab76141da cn/diff-indent-no-longer-is-experimental later to maint).
165+ (merge 8684dde10d jm/relnotes-2.15-typofix later to maint).
166+ (merge cd3f8e2fc2 ks/mailmap later to maint).
0 commit comments