5f9953d2c3 · matheusbsbs/matheus-bagliano

@@ -66,6 +66,17 @@ UI, Workflows & Features

66 * We learned to talk to watchman to speed up "git status" and other

67 operations that need to see which paths have been modified.

68

69 + * The "diff" family of commands learned to ignore differences in

70 + carriage return at the end of line.

71 +

72 + * Places that know about "sendemail.to", like documentation and shell

73 + completion (in contrib/) have been taught about "sendemail.tocmd",

74 + too.

75 +

76 + * "git add --renormalize ." is a new and safer way to record the fact

77 + that you are correcting the end-of-line convention and other

78 + "convert_to_git()" glitches in the in-repository data.

79 +

80

81 Performance, Internal Implementation, Development Support etc.

82

@@ -119,7 +130,7 @@ Fixes since v2.15

130 latter, which has been fixed.

131

132 * The experimental "color moved lines differently in diff output"

122 - feature was buggy around "ignore whitespace changes" edges, whihch

133 + feature was buggy around "ignore whitespace changes" edges, which

134 has been corrected.

135

136 * Instead of using custom line comparison and hashing functions to

@@ -130,7 +141,7 @@ Fixes since v2.15

141 HEAD points at, which have been fixed.

142

143 * "git commit", after making a commit, did not check for errors when

133 - asking on what branch it made the commit, which has been correted.

144 + asking on what branch it made the commit, which has been corrected.

145

146 * "git status --ignored -u" did not stop at a working tree of a

147 separate project that is embedded in an ignored directory and

@@ -141,7 +152,7 @@ Fixes since v2.15

152 --recurse-submodules" has been fixed.

153

154 * A recent regression in "git rebase -i" that broke execution of git

144 - commands from subdirectories via "exec" insn has been fixed.

155 + commands from subdirectories via "exec" instruction has been fixed.

156

157 * A (possibly flakey) test fix.

158

@@ -178,7 +189,6 @@ Fixes since v2.15

189

190 * Error checking in "git imap-send" for empty response has been

191 improved.

181 - (merge 618ec81abb rs/imap-send-next-arg-fix later to maint).

192

193 * Recent update to the refs infrastructure implementation started

194 rewriting packed-refs file more often than before; this has been

@@ -198,11 +208,58 @@ Fixes since v2.15

208 that does not help anything; it has been corrected.

209

210 * Doc update around use of "format-patch --subject-prefix" etc.

201 - (merge f6be7edcac ad/submitting-patches-title-decoration later to maint).

211

212 * A fix for an ancient bug in "git apply --ignore-space-change" codepath.

204 - (merge 6ce15ce576 rs/apply-fuzzy-match-fix later to maint).

213 +

214 + * Clarify and enhance documentation for "merge-base --fork-point", as

215 + it was clear what it computed but not why/what for.

216 + (merge 6d1700b8af jc/merge-base-fork-point-doc later to maint).

217 +

218 + * A few scripts (both in production and tests) incorrectly redirected

219 + their error output. These have been corrected.

220 + (merge eadf1c8f45 tz/redirect-fix later to maint).

221 +

222 + * "git notes" sent its error message to its standard output stream,

223 + which was corrected.

224 + (merge 89b9e31dd5 tz/notes-error-to-stderr later to maint).

225 +

226 + * The three-way merge performed by "git cherry-pick" was confused

227 + when a new submodule was added in the meantime, which has been

228 + fixed (or "papered over").

229 + (merge c641ca6707 sb/test-cherry-pick-submodule-getting-in-a-way later to maint).

230 +

231 + * The sequencer machinery (used by "git cherry-pick A..B", and "git

232 + rebase -i", among other things) would have lost a commit if stopped

233 + due to an unlockable index file, which has been fixed.

234 + (merge bd58886775 pw/sequencer-recover-from-unlockable-index later to maint).

235 +

236 + * "git apply --inaccurate-eof" when used with "--ignore-space-change"

237 + triggered an internal sanity check, which has been fixed.

238 + (merge 4855de1233 rs/apply-inaccurate-eof-with-incomplete-line later to maint).

239 +

240 + * Command line completion (in contrib/) has been taught about the

241 + "--copy" option of "git branch".

242 + (merge 41ca0f773e tz/complete-branch-copy later to maint).

243 +

244 + * When "git rebase" prepared an mailbox of changes and fed it to "git

245 + am" to replay them, it was confused when a stray "From " happened

246 + to be in the log message of one of the replayed changes. This has

247 + been corrected.

248 + (merge ae3b2b04bb ew/rebase-mboxrd later to maint).

249 +

250 + * There was a recent semantic mismerge in the codepath to write out a

251 + section of a configuration section, which has been corrected.

252 + (merge 782c030ea2 rs/config-write-section-fix later to maint).

253 +

254 + * Mentions of "git-rebase" and "git-am" (dashed form) still remained

255 + in end-user visible strings emitted by the "git rebase" command;

256 + they have been corrected.

257 + (merge 82cb775c06 ks/rebase-no-git-foo later to maint).

258 +

259 + * Contrary to the documentation, "git pull -4/-6 other-args" did not

260 + ask the underlying "git fetch" to go over IPv4/IPv6, which has been

261 + corrected.

262 + (merge ffb4568afe sw/pull-ipv46-passthru later to maint).

263

264 * Other minor doc, test and build updates and code cleanups.

207 - (merge f4e45cb3eb ma/bisect-leakfix later to maint).

208 - (merge 4da72644b7 ma/reduce-heads-leakfix later to maint).

265 + (merge c5e3bc6ec4 sd/branch-copy later to maint).

RelNotes: the sixth batch for 2.16