summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.8.0.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/RelNotes/1.8.0.txt')
-rw-r--r--Documentation/RelNotes/1.8.0.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt
index 9714422dee..90c4f4795f 100644
--- a/Documentation/RelNotes/1.8.0.txt
+++ b/Documentation/RelNotes/1.8.0.txt
@@ -31,6 +31,10 @@ UI, Workflows & Features
* A credential helper to allow access to the Gnome keyring has been
added.
+ * When "git am" sanitizes the Subject: line, we strip the prefix from
+ "Re: subject" and also from a less common "re: subject", but left
+ even less common "RE: subject" intact.
+
* It was tempting to say "git branch --set-upstream origin/master",
but that tells Git to arrange the local branch "origin/master" to
integrate with the currently checked out branch, which is highly
@@ -54,6 +58,9 @@ UI, Workflows & Features
* "git merge-base" learned "--is-ancestor A B" option to tell if A is
an ancestor of B. The result is indicated by its exit status code.
+ * The "-Xours" backend option to "git merge -s recursive" now takes
+ effect even on binary files.
+
Foreign Interface