File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -31,6 +31,10 @@ UI, Workflows & Features
31
31
* A credential helper to allow access to the Gnome keyring has been
32
32
added.
33
33
34
+ * When "git am" sanitizes the Subject: line, we strip the prefix from
35
+ "Re: subject" and also from a less common "re: subject", but left
36
+ even less common "RE: subject" intact.
37
+
34
38
* It was tempting to say "git branch --set-upstream origin/master",
35
39
but that tells Git to arrange the local branch "origin/master" to
36
40
integrate with the currently checked out branch, which is highly
@@ -54,6 +58,9 @@ UI, Workflows & Features
54
58
* "git merge-base" learned "--is-ancestor A B" option to tell if A is
55
59
an ancestor of B. The result is indicated by its exit status code.
56
60
61
+ * The "-Xours" backend option to "git merge -s recursive" now takes
62
+ effect even on binary files.
63
+
57
64
58
65
Foreign Interface
59
66
You can’t perform that action at this time.
0 commit comments