From b9b17d304d01c0ba9499315c5eff54b9a89e1d08 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 12 Feb 2019 01:32:48 -0500 Subject: RelNotes/2.21: tweak "--date=auto" mention In the feature that was eventually committed, "--date=auto" doesn't do anything. It was generalized to "--date=auto:". Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.21.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation') diff --git a/Documentation/RelNotes/2.21.0.txt b/Documentation/RelNotes/2.21.0.txt index 8a9a8dd496..77b8d9d221 100644 --- a/Documentation/RelNotes/2.21.0.txt +++ b/Documentation/RelNotes/2.21.0.txt @@ -77,9 +77,9 @@ UI, Workflows & Features * A new date format "--date=human" that morphs its output depending on how far the time is from the current time has been introduced. - "--date=auto" can be used to use this new format when the output is - going to the pager or to the terminal and otherwise the default - format. + "--date=auto:human" can be used to use this new format (or any + existing format) when the output is going to the pager or to the + terminal, and otherwise the default format. Performance, Internal Implementation, Development Support etc. -- cgit v1.2.3 From e9bd4aa026178caeed76ca00d9034c9dfdb3eefb Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 12 Feb 2019 01:33:04 -0500 Subject: RelNotes/2.21: misc typo/English fixups These are just some small fixes I noticed doing a complete read-through (there are a few cases I left that are incomplete or abbreviated sentences, but I think those are OK in this sort of bullet-list style). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.21.0.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Documentation') diff --git a/Documentation/RelNotes/2.21.0.txt b/Documentation/RelNotes/2.21.0.txt index 77b8d9d221..702ebfcdc3 100644 --- a/Documentation/RelNotes/2.21.0.txt +++ b/Documentation/RelNotes/2.21.0.txt @@ -26,7 +26,7 @@ UI, Workflows & Features the fast-export side has been made. * "git push $there $src:$dst" rejects when $dst is not a fully - qualified refname and not clear what the end user meant. The + qualified refname and it is not clear what the end user meant. The codepath has been taught to give a clearer error message, and also guess where the push should go by taking the type of the pushed object into account (e.g. a tag object would want to go under @@ -88,7 +88,7 @@ Performance, Internal Implementation, Development Support etc. (non-)existence of loose objects. * More codepaths have become aware of working with in-core repository - instance other than the default "the_repository". + instances other than the default "the_repository". * The "strncat()" function is now among the banned functions. @@ -125,13 +125,13 @@ Performance, Internal Implementation, Development Support etc. * The in-core repository instances are passed through more codepaths. * Update the protocol message specification to allow only the limited - use of scaled quantities. This is ensure potential compatibility - issues will not go out of hand. + use of scaled quantities. This is to ensure potential compatibility + issues will not get out of hand. * Micro-optimize the code that prepares commit objects to be walked by "git rev-list" when the commit-graph is available. - * "git fetch" and "git upload-pack" learned to send all exchange over + * "git fetch" and "git upload-pack" learned to send all exchanges over the sideband channel while talking the v2 protocol. * The codepath to write out commit-graph has been optimized by -- cgit v1.2.3 From 8989e1950a845ceeb186d490321a4f917ca4de47 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 13 Feb 2019 18:18:11 -0800 Subject: Git 2.21-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.21.0.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Documentation') diff --git a/Documentation/RelNotes/2.21.0.txt b/Documentation/RelNotes/2.21.0.txt index 702ebfcdc3..7a49deddf3 100644 --- a/Documentation/RelNotes/2.21.0.txt +++ b/Documentation/RelNotes/2.21.0.txt @@ -180,6 +180,13 @@ Performance, Internal Implementation, Development Support etc. * A flakey "p4" test has been removed. + * The code and tests assume that the system supplied iconv() would + always use BOM in its output when asked to encode to UTF-16 (or + UTF-32), but apparently some implementations output big-endian + without BOM. A compile-time knob has been added to help such + systems (e.g. NonStop) to add BOM to the output to increase + portability. + Fixes since v2.20 ----------------- @@ -439,3 +446,6 @@ Fixes since v2.20 (merge 2e285e7803 tz/gpg-test-fix later to maint). (merge 5427de960b kl/pretty-doc-markup-fix later to maint). (merge 3815f64b0d js/mingw-host-cpu later to maint). + (merge 5fe81438b5 rj/sequencer-sign-off-header-static later to maint). + (merge 18a4f6be6b nd/fileno-may-be-macro later to maint). + (merge 99e9ab54ab kd/t0028-octal-del-is-377-not-777 later to maint). -- cgit v1.2.3 From b83ffbdac349b744b87b658d78b7e0b9b7b51954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Thu, 14 Feb 2019 00:44:33 +0100 Subject: docs/git-rebase: remove redundant entry in incompatible options list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The --autosquash option is implied by the earlier --[no-]autosquash entry in the list. Signed-off-by: Emilio Cobos Álvarez Reviewed-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index dff17b3178..186c5d0cf6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -535,7 +535,6 @@ Flags only understood by the interactive backend: * --interactive * --exec * --keep-empty - * --autosquash * --edit-todo * --root when used in combination with --onto -- cgit v1.2.3 From 29d03f84a1bd0e27ab172bcd80382c5e2e8df1ec Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Thu, 14 Feb 2019 12:25:41 -0800 Subject: git-rebase.txt: update to reflect merge now implemented on sequencer Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer', 2019-02-06), --merge now uses the interactive backend (and matches its behavior) so there is no separate merge backend anymore. Fix an oversight in the docs that should have been updated with the previous change. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 8bfa36a185..29307b1340 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -549,8 +549,6 @@ commit started empty (had no changes relative to its parent to start with) or ended empty (all changes were already applied upstream in other commits). -The merge backend does the same. - The interactive backend drops commits by default that started empty and halts if it hits a commit that ended up empty. The `--keep-empty` option exists for the interactive backend to allow -- cgit v1.2.3