projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 375f8a03 JH |
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 | ||
| ea1ab4b2 JH |
15 | * "git add -p" did not work correctly when a hunk is split and then |
| 16 | one of them was given to the editor. | |
| 17 | ||
| 18 | * "git add -u" did not resolve a conflict where our history deleted and | |
| 19 | their history modified the same file, and the working tree resolved to | |
| 20 | keep a file. | |
| 21 | ||
| 375f8a03 JH |
22 | * "git cvsimport" did not know that CVSNT stores its password file in a |
| 23 | location different from the traditional CVS. | |
| 24 | ||
| 25 | * "git diff-files" did not show the mode information from the working | |
| 26 | tree side of an unmerged path correctly. | |
| 27 | ||
| 28 | * "git diff -M --cached" used to use unmerged path as a possible rename | |
| 29 | source candidate, which made no sense. | |
| 30 | ||
| ea1ab4b2 JH |
31 | * The option name parser in "git fast-import" used prefix matches for |
| 32 | some options where it shouldn't, and accepted non-existent options, | |
| 33 | e.g. "--relative-marksmith" or "--forceps". | |
| 34 | ||
| 96dbe93d JH |
35 | * "git format-patch" did not quote RFC822 special characters in the |
| 36 | email address (e.g From: Junio C. Hamano <jch@example.com>, not | |
| 37 | From: "Junio C. Hamano" <jch@example.com>). | |
| 38 | ||
| 39 | * "git format-patch" when run with "--quiet" option used to produce a | |
| 40 | nonsense result that consists of alternating empty output. | |
| 41 | ||
| ea1ab4b2 JH |
42 | * In "git merge", per-branch branch.<name>.mergeoptions configuration |
| 43 | variables did not override the fallback default merge.<option> | |
| 44 | configuration variables such as merge.ff, merge.log, etc. | |
| 45 | ||
| 375f8a03 JH |
46 | * "git merge-one-file" did not honor GIT_WORK_TREE settings when |
| 47 | handling a "both sides added, differently" conflict. | |
| 48 | ||
| 96dbe93d JH |
49 | * "git mergetool" did not handle conflicted submoudules gracefully. |
| 50 | ||
| 375f8a03 JH |
51 | * "git-p4" (in contrib) used a wrong base image while merge a file that |
| 52 | was added on both branches differently. | |
| 53 | ||
| 54 | * "git rebase -i -p" failed to preserve the history when there is a | |
| 55 | redundant merge created with the --no-ff option. | |
| 56 | ||
| 57 | And other minor fixes and documentation updates. |