1Git v1.7.5.2 Release Notes 2========================== 3 4The release notes to 1.7.5.1 forgot to mention: 5 6 * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now 7 mean the same thing. 8 9 * "git upload-pack" (hence "git push" over git native protocol) had a 10 subtle race condition that could lead to a deadlock. 11 12Fixes since v1.7.5.1 13-------------------- 14 15 * "git cvsimport" did not know that CVSNT stores its password file in a 16 location different from the traditional CVS. 17 18 * "git diff-files" did not show the mode information from the working 19 tree side of an unmerged path correctly. 20 21 * "git diff -M --cached" used to use unmerged path as a possible rename 22 source candidate, which made no sense. 23 24 * "git format-patch" did not quote RFC822 special characters in the 25 email address (e.g From: Junio C. Hamano <jch@example.com>, not 26 From: "Junio C. Hamano" <jch@example.com>). 27 28 * "git format-patch" when run with "--quiet" option used to produce a 29 nonsense result that consists of alternating empty output. 30 31 * "git merge-one-file" did not honor GIT_WORK_TREE settings when 32 handling a "both sides added, differently" conflict. 33 34 * "git mergetool" did not handle conflicted submoudules gracefully. 35 36 * "git-p4" (in contrib) used a wrong base image while merge a file that 37 was added on both branches differently. 38 39 * "git rebase -i -p" failed to preserve the history when there is a 40 redundant merge created with the --no-ff option. 41 42And other minor fixes and documentation updates.