@@ -58,6 +58,16 @@ UI, Workflows & Features
5858 always interpreted as a pathspec; "git cmd -- :/" is no longer
5959 needed, you can just say "git cmd :/".
6060
61+ * Various "hint" lines Git gives when it asks the user to edit
62+ messages in the editor are commented out with '#' by default. The
63+ core.commentchar configuration variable can be used to customize
64+ this '#' to a different character.
65+
66+ * "git add -u" and "git add -A" without pathspec issues warning to
67+ make users aware that they are only operating on paths inside the
68+ subdirectory they are in. Use ":/" (everything from the top) or
69+ "." (everything from the $cwd) to disambiguate.
70+
6171 * "git blame" (and "git diff") learned the "--no-follow" option.
6272
6373 * "git check-ignore" command to help debugging .gitignore files has
@@ -92,6 +102,10 @@ UI, Workflows & Features
92102 * "git push" now requires "-f" to update a tag, even if it is a
93103 fast-forward, as tags are meant to be fixed points.
94104
105+ * Error messages from "git push" when it stops to prevent remote refs
106+ from getting overwritten by mistake have been improved to explain
107+ various situations separately.
108+
95109 * "git push" will stop without doing anything if the new "pre-push"
96110 hook exists and exits with a failure.
97111
@@ -121,7 +135,8 @@ Foreign Interface
121135 * A new remote helper to interact with bzr has been added to contrib/.
122136
123137 * "git p4" got various bugfixes around its branch handling. It is
124- also made usable with Python 2.4/2.5.
138+ also made usable with Python 2.4/2.5. In addition, its various
139+ portability issues for Cygwin have been addressed.
125140
126141 * The remote helper to interact with Hg in contrib/ has seen a few
127142 fixes.
@@ -198,7 +213,7 @@ details).
198213 attempt to kill a process spawned in the editor that was in turn
199214 launched by Git with SIGINT (or SIGQUIT), as Git would catch that
200215 signal and die. We ignore these signals now.
201- (merge 1250857 pf/editor-ignore-sigint later to maint).
216+ (merge 0398fc34 pf/editor-ignore-sigint later to maint).
202217
203218 * A child process that was killed by a signal (e.g. SIGINT) was
204219 reported in an inconsistent way depending on how the process was
@@ -210,18 +225,15 @@ details).
210225 * We used to stuff "user@" and then append what we read from
211226 /etc/mailname to come up with a default e-mail ident, but a bug
212227 lost the "user@" part.
213- (merge dc342a2 jn/do-not-drop-username-when-reading-from-etc-mailname later to maint).
214228
215229 * The attribute mechanism didn't allow limiting attributes to be
216230 applied to only a single directory itself with "path/" like the
217231 exclude mechanism does. The initial implementation of this that
218232 was merged to 'maint' and 1.8.1.2 was with a severe performance
219233 degradations and needs to merge a fix-up topic.
220- (merge 9db9eec nd/fix-directory-attrs-off-by-one later to maint).
221234
222235 * "git am" did not parse datestamp correctly from Hg generated patch,
223236 when it is run in a locale outside C (or en).
224- (merge 5185b97 dl/am-hg-locale later to maint).
225237
226238 * "git apply" misbehaved when fixing whitespace breakages by removing
227239 excess trailing blank lines.
@@ -232,9 +244,12 @@ details).
232244 * "git archive" did not record uncompressed size in the header when
233245 streaming a zip archive, which confused some implementations of unzip.
234246
247+ * "git archive" did not parse configuration values in tar.* namespace
248+ correctly.
249+ (merge b3873c3 jk/config-parsing-cleanup later to maint).
250+
235251 * Attempt to "branch --edit-description" an existing branch, while
236252 being on a detached HEAD, errored out.
237- (merge 75135b2 nd/edit-branch-desc-while-detached later to maint).
238253
239254 * "git clean" showed what it was going to do, but sometimes end up
240255 finding that it was not allowed to do so, which resulted in a
@@ -254,6 +269,10 @@ details).
254269 command, and documentation was misleading.
255270 (merge cfb70e1 nd/fetch-depth-is-broken later to maint).
256271
272+ * "git log --all -p" that walked refs/notes/textconv/ ref can later
273+ try to use the textconv data incorrectly after it gets freed.
274+ (merge be5c9fb jk/read-commit-buffer-data-after-free later to maint).
275+
257276 * The way "git svn" asked for password using SSH_ASKPASS and
258277 GIT_ASKPASS was not in line with the rest of the system.
259278
@@ -275,7 +294,6 @@ details).
275294
276295 * "git rebase --preserve-merges" lost empty merges in recent versions
277296 of Git.
278- (merge 9869778 ph/rebase-preserve-all-merges later to maint).
279297
280298 * "git merge --no-edit" computed who were involved in the work done
281299 on the side branch, even though that information is to be discarded
@@ -313,7 +331,6 @@ details).
313331
314332 * Command line completion code was inadvertently made incompatible with
315333 older versions of bash by using a newer array notation.
316- (merge 50c5885 bc/fix-array-syntax-for-3.0-in-completion-bash later to maint).
317334
318335 * Some shells do not behave correctly when IFS is unset; work it
319336 around by explicitly setting it to the default value.
@@ -330,7 +347,6 @@ details).
330347
331348 * t0050 had tests expecting failures from a bug that was fixed some
332349 time ago.
333- (merge 336e2e2 tb/t0050-maint later to maint).
334350
335351 * t4014, t9502 and t0200 tests had various portability issues that
336352 broke on OpenBSD.
0 commit comments