File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ Git v1.7.5.2 Release Notes
2+ ==========================
3+
4+ The 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+
12+ Fixes 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 merge-one-file" did not honor GIT_WORK_TREE settings when
25+ handling a "both sides added, differently" conflict.
26+
27+ * "git-p4" (in contrib) used a wrong base image while merge a file that
28+ was added on both branches differently.
29+
30+ * "git rebase -i -p" failed to preserve the history when there is a
31+ redundant merge created with the --no-ff option.
32+
33+ And other minor fixes and documentation updates.
Original file line number Diff line number Diff line change 1- Documentation/RelNotes/1.7.5.1 .txt
1+ Documentation/RelNotes/1.7.5.2 .txt
You can’t perform that action at this time.
0 commit comments