File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -31,6 +31,10 @@ UI, Workflows & Features
3131 * A credential helper to allow access to the Gnome keyring has been
3232 added.
3333
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+
3438 * It was tempting to say "git branch --set-upstream origin/master",
3539 but that tells Git to arrange the local branch "origin/master" to
3640 integrate with the currently checked out branch, which is highly
@@ -54,6 +58,9 @@ UI, Workflows & Features
5458 * "git merge-base" learned "--is-ancestor A B" option to tell if A is
5559 an ancestor of B. The result is indicated by its exit status code.
5660
61+ * The "-Xours" backend option to "git merge -s recursive" now takes
62+ effect even on binary files.
63+
5764
5865Foreign Interface
5966
You can’t perform that action at this time.
0 commit comments