@@ -17,14 +17,14 @@ preference configuration variable "push.default" to change this.
1717
1818"git push $there tag v1.2.3" used to allow replacing a tag v1.2.3
1919that already exists in the repository $there, if the rewritten tag
20- you are pushing points at a commit that is a decendant of a commit
20+ you are pushing points at a commit that is a descendant of a commit
2121that the old tag v1.2.3 points at. This was found to be error prone
2222and starting with this release, any attempt to update an existing
2323ref under refs/tags/ hierarchy will fail, without "--force".
2424
2525When "git add -u" and "git add -A", that does not specify what paths
2626to add on the command line, is run from inside a subdirectory, the
27- scope of the operation has always been limited to the subirectory .
27+ scope of the operation has always been limited to the subdirectory .
2828Many users found this counter-intuitive, given that "git commit -a"
2929and other commands operate on the entire tree regardless of where you
3030are. In this release, these commands give warning in such a case and
@@ -125,7 +125,7 @@ UI, Workflows & Features
125125 string "v$count-" to the names of its output files, and also
126126 automatically sets the subject prefix to "PATCH v$count". This
127127 allows patches from rerolled series to be stored under different
128- names and makes it easier to reuse cover letter messsages .
128+ names and makes it easier to reuse cover letter messages .
129129
130130 * "git log" and friends can be told with --use-mailmap option to
131131 rewrite the names and email addresses of people using the mailmap
@@ -295,7 +295,6 @@ details).
295295 * The smart HTTP clients forgot to verify the content-type that comes
296296 back from the server side to make sure that the request is being
297297 handled properly.
298- (merge 3443db5 sp/smart-http-content-type-check later to maint).
299298
300299 * "git am" did not parse datestamp correctly from Hg generated patch,
301300 when it is run in a locale outside C (or en).
@@ -306,7 +305,6 @@ details).
306305 * "git apply --summary" has been taught to make sure the similarity
307306 value shown in its output is sensible, even when the input had a
308307 bogus value.
309- (merge afcb6ac jk/apply-similaritly-parsing later to maint).
310308
311309 * A tar archive created by "git archive" recorded a directory in a
312310 way that made NetBSD's implementation of "tar" sometimes unhappy.
@@ -327,19 +325,16 @@ details).
327325 untracked directory, it found an embedded git repository there
328326 which it is not allowed to remove). It now performs the actions
329327 and then reports the outcome more faithfully.
330- (merge f538a91 zk/clean-report-failure later to maint).
331328
332329 * When "git clone --separate-git-dir=$over_there" is interrupted, it
333330 failed to remove the real location of the $GIT_DIR it created.
334331 This was most visible when interrupting a submodule update.
335332
336333 * "git cvsimport" mishandled timestamps at DST boundary.
337- (merge 48c9162 bw/get-tz-offset-perl later to maint).
338334
339335 * We used to have an arbitrary 32 limit for combined diff input,
340336 resulting in incorrect number of leading colons shown when showing
341337 the "--raw --cc" output.
342- (merge edbc00e jc/combine-diff-many-parents later to maint).
343338
344339 * "git fetch --depth" was broken in at least three ways. The
345340 resulting history was deeper than specified by one commit, it was
@@ -349,7 +344,6 @@ details).
349344
350345 * "git log --all -p" that walked refs/notes/textconv/ ref can later
351346 try to use the textconv data incorrectly after it gets freed.
352- (merge be5c9fb jk/read-commit-buffer-data-after-free later to maint).
353347
354348 * We forgot to close the file descriptor reading from "gpg" output,
355349 killing "git log --show-signature" on a long history.
@@ -374,7 +368,6 @@ details).
374368
375369 * "git clone" used to allow --bare and --separate-git-dir=$there
376370 options at the same time, which was nonsensical.
377- (merge 95b63f1 nd/clone-no-separate-git-dir-with-bare later to maint).
378371
379372 * "git rebase --preserve-merges" lost empty merges in recent versions
380373 of Git.
@@ -409,7 +402,6 @@ details).
409402 * "gitweb" pages served over HTTPS, when configured to show picon or
410403 gravatar, referred to these external resources to be fetched via
411404 HTTP, resulting in mixed contents warning in browsers.
412- (merge 5748558 ab/gitweb-use-same-scheme later to maint).
413405
414406 * When a line to be wrapped has a solid run of non space characters
415407 whose length exactly is the wrap width, "git shortlog -w" failed
@@ -427,7 +419,7 @@ details).
427419 * "git push" was taught to refuse updating the branch that is
428420 currently checked out long time ago, but the user manual was left
429421 stale.
430- (merge d9be248 wk/man-deny-current-branch-is-default-these-days later to maint).
422+ (merge 50995ed wk/man-deny-current-branch-is-default-these-days later to maint).
431423
432424 * Some shells do not behave correctly when IFS is unset; work it
433425 around by explicitly setting it to the default value.
@@ -446,7 +438,11 @@ details).
446438
447439 * The autoconf subsystem passed --mandir down to generated
448440 config.mak.autogen but forgot to do the same for --htmldir.
449- (merge fc1c541 ct/autoconf-htmldir later to maint).
441+ (merge 55d9bf0 ct/autoconf-htmldir later to maint).
442+
443+ * A change made on v1.8.1.x maintenance track had a nasty regression
444+ to break the build when autoconf is used.
445+ (merge 7f1b697 jn/less-reconfigure later to maint).
450446
451447 * We have been carrying a translated and long-unmaintained copy of an
452448 old version of the tutorial; removed.
0 commit comments