Skip to content

Commit 49fa3dc

Browse files
committed
Git 2.9-rc2
Signed-off-by: Junio C Hamano <[email protected]>
1 parent c42b5d8 commit 49fa3dc

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

Documentation/RelNotes/2.9.0.txt

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ UI, Workflows & Features
112112
is a lot easier to explain to the end users: "We describe a commit
113113
in terms of the (chronologically) oldest tag that contains the
114114
commit."
115-
(merge 7550424 js/name-rev-use-oldest-ref later to maint).
116115

117116
* "git clone" learned the "--shallow-submodules" option.
118117

@@ -229,7 +228,6 @@ Performance, Internal Implementation, Development Support etc.
229228
our tests under "bash", however, we can redirect the trace output
230229
to another file descriptor to keep the standard error of programs
231230
being tested intact.
232-
(merge d88785e jk/test-send-sh-x-trace-elsewhere later to maint).
233231

234232
* t0040 had too many unnecessary repetitions in its test data. Teach
235233
test-parse-options program so that a caller can tell what it
@@ -258,6 +256,12 @@ Performance, Internal Implementation, Development Support etc.
258256
config.mak didn't.
259257
(merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).
260258

259+
* The way how "submodule--helper list" signals unmatch error to its
260+
callers has been updated.
261+
262+
* A bash-ism "local" has been removed from "git submodule" scripted
263+
Porcelain.
264+
261265

262266
Also contains various documentation updates and code clean-ups.
263267

@@ -435,20 +439,16 @@ notes for details).
435439

436440
* "http.cookieFile" configuration variable clearly wants a pathname,
437441
but we forgot to treat it as such by e.g. applying tilde expansion.
438-
(merge e5a39ad bn/http-cookiefile-config later to maint).
439442

440443
* Consolidate description of tilde-expansion that is done to
441444
configuration variables that take pathname to a single place.
442-
(merge dca83ab jc/config-pathname-type later to maint).
443445

444446
* Correct faulty recommendation to use "git submodule deinit ." when
445447
de-initialising all submodules, which would result in a strange
446448
error message in a pathological corner case.
447-
(merge f6a5279 sb/submodule-deinit-all later to maint).
448449

449450
* Many 'linkgit:<git documentation page>' references were broken,
450451
which are all fixed with this.
451-
(merge 1cca17d jc/linkgit-fix later to maint).
452452

453453
* "git rerere" can get confused by conflict markers deliberately left
454454
by the inner merge step, because they are indistinguishable from
@@ -458,43 +458,34 @@ notes for details).
458458
(merge 0f9fd5c jc/ll-merge-internal later to maint).
459459

460460
* CI test was taught to build documentation pages.
461-
(merge b98712b ls/travis-build-doc later to maint).
462461

463462
* "git fsck" learned to catch NUL byte in a commit object as
464463
potential error and warn.
465-
(merge 6d2d780 jc/fsck-nul-in-commit later to maint).
466464

467465
* Portability enhancement for "rebase -i" to help platforms whose
468466
shell does not like "for i in <empty>" (which is not POSIX-kosher).
469-
(merge 8e98b35 jk/rebase-interactive-eval-fix later to maint).
470467

471468
* On Windows, .git and optionally any files whose name starts with a
472469
dot are now marked as hidden, with a core.hideDotFiles knob to
473470
customize this behaviour.
474-
(merge ebf31e7 js/windows-dotgit later to maint).
475471

476472
* Documentation for "git merge --verify-signatures" has been updated
477473
to clarify that the signature of only the commit at the tip is
478474
verified. Also the phrasing used for signature and key validity is
479475
adjusted to align with that used by OpenPGP.
480-
(merge 05a5869 kf/gpg-sig-verification-doc later to maint).
481476

482477
* A couple of bugs around core.autocrlf have been fixed.
483-
(merge caa47ad tb/core-eol-fix later to maint).
484478

485479
* Many commands normalize command line arguments from NFD to NFC
486480
variant of UTF-8 on OSX, but commands in the "diff" family did
487481
not, causing "git diff $path" to complain that no such path is
488482
known to Git. They have been taught to do the normalization.
489-
(merge 90a78b8 ar/diff-args-osx-precompose later to maint).
490483

491484
* "git difftool" learned to handle unmerged paths correctly in
492485
dir-diff mode.
493-
(merge 366f9ce da/difftool later to maint).
494486

495487
* The "are we talking with TTY, doing an interactive session?"
496488
detection has been updated to work better for "Git for Windows".
497-
(merge f7f90e0 kb/msys2-tty later to maint).
498489

499490
* We forgot to add "git log --decorate=auto" to documentation when we
500491
added the feature back in v2.1.0 timeframe.
@@ -512,16 +503,6 @@ notes for details).
512503
(merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).
513504

514505
* Other minor clean-ups and documentation updates
515-
(merge 832c0e5 lp/typofixes later to maint).
516-
(merge f5ee54a sb/z-is-gnutar-ism later to maint).
517-
(merge 2e3926b va/i18n-misc-updates later to maint).
518-
(merge f212dcc bn/config-doc-tt-varnames later to maint).
519-
(merge f54bea4 nd/remote-plural-ours-plus-theirs later to maint).
520-
(merge 2bb0518 ak/t4151-ls-files-could-be-empty later to maint).
521-
(merge 4df4313 jc/test-seq later to maint).
522-
(merge a75a308 tb/t5601-sed-fix later to maint).
523-
(merge 6c1fbe1 va/i18n-remote-comment-to-align later to maint).
524-
(merge dee2303 va/mailinfo-doc-typofix later to maint).
525506
(merge cd82b7a pa/cherry-pick-doc-typo later to maint).
526507
(merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
527508
(merge aa20cbc rs/apply-name-terminate later to maint).

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.9.0-rc1
4+
DEF_VER=v2.9.0-rc2
55

66
LF='
77
'

0 commit comments

Comments
 (0)