Git 2.9-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 6, 2016 at 14:19 UTC
49fa3dc76179e04b0833542fa52d0f287a4955ac
2 files changed
+7
-26
Documentation/RelNotes/2.9.0.txt
+6
-25
@@ -112,7 +112,6 @@ UI, Workflows & Features
112
is a lot easier to explain to the end users: "We describe a commit
113
in terms of the (chronologically) oldest tag that contains the
114
commit."
115
- (merge 7550424 js/name-rev-use-oldest-ref later to maint).
115
116
* "git clone" learned the "--shallow-submodules" option.
117
@@ -229,7 +228,6 @@ Performance, Internal Implementation, Development Support etc.
228
our tests under "bash", however, we can redirect the trace output
229
to another file descriptor to keep the standard error of programs
230
being tested intact.
232
- (merge d88785e jk/test-send-sh-x-trace-elsewhere later to maint).
231
232
* t0040 had too many unnecessary repetitions in its test data. Teach
233
test-parse-options program so that a caller can tell what it
@@ -258,6 +256,12 @@ Performance, Internal Implementation, Development Support etc.
256
config.mak didn't.
257
(merge 51dd3e8 mm/makefile-developer-can-be-in-config-mak later to maint).
258
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
+
265
266
Also contains various documentation updates and code clean-ups.
267
@@ -435,20 +439,16 @@ notes for details).
439
440
* "http.cookieFile" configuration variable clearly wants a pathname,
441
but we forgot to treat it as such by e.g. applying tilde expansion.
438
- (merge e5a39ad bn/http-cookiefile-config later to maint).
442
443
* Consolidate description of tilde-expansion that is done to
444
configuration variables that take pathname to a single place.
442
- (merge dca83ab jc/config-pathname-type later to maint).
445
446
* Correct faulty recommendation to use "git submodule deinit ." when
447
de-initialising all submodules, which would result in a strange
448
error message in a pathological corner case.
447
- (merge f6a5279 sb/submodule-deinit-all later to maint).
449
450
* Many 'linkgit:<git documentation page>' references were broken,
451
which are all fixed with this.
451
- (merge 1cca17d jc/linkgit-fix later to maint).
452
453
* "git rerere" can get confused by conflict markers deliberately left
454
by the inner merge step, because they are indistinguishable from
@@ -458,43 +458,34 @@ notes for details).
458
(merge 0f9fd5c jc/ll-merge-internal later to maint).
459
460
* CI test was taught to build documentation pages.
461
- (merge b98712b ls/travis-build-doc later to maint).
461
462
* "git fsck" learned to catch NUL byte in a commit object as
463
potential error and warn.
465
- (merge 6d2d780 jc/fsck-nul-in-commit later to maint).
464
465
* Portability enhancement for "rebase -i" to help platforms whose
466
shell does not like "for i in <empty>" (which is not POSIX-kosher).
469
- (merge 8e98b35 jk/rebase-interactive-eval-fix later to maint).
467
468
* On Windows, .git and optionally any files whose name starts with a
469
dot are now marked as hidden, with a core.hideDotFiles knob to
470
customize this behaviour.
474
- (merge ebf31e7 js/windows-dotgit later to maint).
471
472
* Documentation for "git merge --verify-signatures" has been updated
473
to clarify that the signature of only the commit at the tip is
474
verified. Also the phrasing used for signature and key validity is
475
adjusted to align with that used by OpenPGP.
480
- (merge 05a5869 kf/gpg-sig-verification-doc later to maint).
476
477
* A couple of bugs around core.autocrlf have been fixed.
483
- (merge caa47ad tb/core-eol-fix later to maint).
478
479
* Many commands normalize command line arguments from NFD to NFC
480
variant of UTF-8 on OSX, but commands in the "diff" family did
481
not, causing "git diff $path" to complain that no such path is
482
known to Git. They have been taught to do the normalization.
489
- (merge 90a78b8 ar/diff-args-osx-precompose later to maint).
483
484
* "git difftool" learned to handle unmerged paths correctly in
485
dir-diff mode.
493
- (merge 366f9ce da/difftool later to maint).
486
487
* The "are we talking with TTY, doing an interactive session?"
488
detection has been updated to work better for "Git for Windows".
497
- (merge f7f90e0 kb/msys2-tty later to maint).
489
490
* We forgot to add "git log --decorate=auto" to documentation when we
491
added the feature back in v2.1.0 timeframe.
@@ -512,16 +503,6 @@ notes for details).
503
(merge 7063693 js/rebase-i-dedup-call-to-rerere later to maint).
504
505
* 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).
506
(merge cd82b7a pa/cherry-pick-doc-typo later to maint).
507
(merge 2bb73ae rs/patch-id-use-skip-prefix later to maint).
508
(merge aa20cbc rs/apply-name-terminate later to maint).
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v2.9.0-rc1
4
+DEF_VER=v2.9.0-rc2
5
6
LF='
7
'