diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:44:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:44:57 -0700 |
commit | 6c7471bcf1453d0452d4f1191edd5f0e44561a77 (patch) | |
tree | b3cbd117329419a5ddc9e69a5b9020d2d5fa17e2 /Documentation/RelNotes | |
parent | c565cb452c1e20babe4d0632c58e0f11a9af30c4 (diff) | |
parent | ea1ab4b280ed3b041da53e161e32e38930569f3e (diff) | |
download | git-6c7471bcf1453d0452d4f1191edd5f0e44561a77.tar.gz git-6c7471bcf1453d0452d4f1191edd5f0e44561a77.tar.xz |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.5.2
Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r-- | Documentation/RelNotes/1.7.5.2.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.txt index b985b07da..951eb7cb0 100644 --- a/Documentation/RelNotes/1.7.5.2.txt +++ b/Documentation/RelNotes/1.7.5.2.txt @@ -12,6 +12,13 @@ The release notes to 1.7.5.1 forgot to mention: Fixes since v1.7.5.1 -------------------- + * "git add -p" did not work correctly when a hunk is split and then + one of them was given to the editor. + + * "git add -u" did not resolve a conflict where our history deleted and + their history modified the same file, and the working tree resolved to + keep a file. + * "git cvsimport" did not know that CVSNT stores its password file in a location different from the traditional CVS. @@ -21,6 +28,10 @@ Fixes since v1.7.5.1 * "git diff -M --cached" used to use unmerged path as a possible rename source candidate, which made no sense. + * The option name parser in "git fast-import" used prefix matches for + some options where it shouldn't, and accepted non-existent options, + e.g. "--relative-marksmith" or "--forceps". + * "git format-patch" did not quote RFC822 special characters in the email address (e.g From: Junio C. Hamano <jch@example.com>, not From: "Junio C. Hamano" <jch@example.com>). @@ -28,6 +39,10 @@ Fixes since v1.7.5.1 * "git format-patch" when run with "--quiet" option used to produce a nonsense result that consists of alternating empty output. + * In "git merge", per-branch branch.<name>.mergeoptions configuration + variables did not override the fallback default merge.<option> + configuration variables such as merge.ff, merge.log, etc. + * "git merge-one-file" did not honor GIT_WORK_TREE settings when handling a "both sides added, differently" conflict. |