File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed
Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -21,9 +21,18 @@ Fixes since v1.7.5.1
2121 * "git diff -M --cached" used to use unmerged path as a possible rename
2222 source candidate, which made no sense.
2323
24+ * "git format-patch" did not quote RFC822 special characters in the
25+ email address (e.g From: Junio C. Hamano <
[email protected] >, not
26+ From: "Junio C. Hamano" <
[email protected] >).
27+
28+ * "git format-patch" when run with "--quiet" option used to produce a
29+ nonsense result that consists of alternating empty output.
30+
2431 * "git merge-one-file" did not honor GIT_WORK_TREE settings when
2532 handling a "both sides added, differently" conflict.
2633
34+ * "git mergetool" did not handle conflicted submoudules gracefully.
35+
2736 * "git-p4" (in contrib) used a wrong base image while merge a file that
2837 was added on both branches differently.
2938
You can’t perform that action at this time.
0 commit comments