summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-12 21:36:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-12 21:36:00 (GMT)
commit30e9940356dc67959877f4b2417da33ebdefbb79 (patch)
tree5ef1b4caff695eb08863c89054cb80910dc2db31
parentb4f0038525623e0e5aa3b35d520de909618cae98 (diff)
downloadgit-30e9940356dc67959877f4b2417da33ebdefbb79.zip
git-30e9940356dc67959877f4b2417da33ebdefbb79.tar.gz
git-30e9940356dc67959877f4b2417da33ebdefbb79.tar.bz2
Hopefully the final batch before -rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.26.0.txt21
1 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.26.0.txt b/Documentation/RelNotes/2.26.0.txt
index 13c2684..80d5e15 100644
--- a/Documentation/RelNotes/2.26.0.txt
+++ b/Documentation/RelNotes/2.26.0.txt
@@ -4,6 +4,20 @@ Git 2.26 Release Notes
Updates since v2.25
-------------------
+Backward compatibility notes
+
+ * "git rebase" uses a different backend that is based on the 'merge'
+ machinery by default. There are a few known differences in the
+ behaviour from the traditional machniery based on patch+apply.
+
+ If your workflow is negatively affected by this change, please
+ report it to git@vger.kernel.org so that we can take a look into
+ it. In the meantime, the 'rebase.backend' configuration variable
+ can be set in order to use the old default behaviour (the value to
+ do so is not described here---it is given to those who report their
+ issues to the list ;-).
+
+
UI, Workflows & Features
* Sample credential helper for using .netrc has been updated to work
@@ -312,6 +326,13 @@ Fixes since v2.25
we can show something not to bore users.
(merge 7655b4119d rs/show-progress-in-dumb-http-fetch later to maint).
+ * Both "git ls-remote -h" and "git grep -h" give short usage help,
+ like any other Git subcommand, but it is not unreasonable to expect
+ that the former would behave the same as "git ls-remote --head"
+ (there is no other sensible behaviour for the latter). The
+ documentation has been updated in an attempt to clarify this.
+ (merge 1ff466c018 jc/doc-single-h-is-for-help later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge 26f924d50e en/simplify-check-updates-in-unpack-trees later to maint).
(merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint).