summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-14 15:51:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-14 16:55:52 (GMT)
commitada6a4117eb204fe14a83bc51daaf923cd8127ec (patch)
treeed083a30233321887b84f78a9cc555a15f0c732a
parent3055d78f97da105acfc0e207266e902251d2949f (diff)
downloadgit-ada6a4117eb204fe14a83bc51daaf923cd8127ec.zip
git-ada6a4117eb204fe14a83bc51daaf923cd8127ec.tar.gz
git-ada6a4117eb204fe14a83bc51daaf923cd8127ec.tar.bz2
Prepare for 1.7.3.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.3.4.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.3.4.txt b/Documentation/RelNotes/1.7.3.4.txt
index 925178f..c2a46a2 100644
--- a/Documentation/RelNotes/1.7.3.4.txt
+++ b/Documentation/RelNotes/1.7.3.4.txt
@@ -14,6 +14,11 @@ Fixes since v1.7.3.3
colon between the hours and minutes part (e.g. "-08:00" instead of
"-0800").
+ * "git checkout" removed an untracked file "foo" from the working
+ tree when switching to a branch that contains a tracked path
+ "foo/bar". Prevent this, just like the case where the conflicting
+ path were "foo" (c752e7f..7980872d).
+
* "git cherry-pick" or "git revert" refused to work when a path that
would be modified by the operation was stat-dirty without a real
difference in the contents of the file.
@@ -21,9 +26,14 @@ Fixes since v1.7.3.3
* "git diff --check" reported an incorrect line number for added
blank lines at the end of file.
+ * "git imap-send" failed to build under NO_OPENSSL.
+
* Setting log.decorate configuration variable to "0" or "1" to mean
"false" or "true" did not work.
+ * "git push" over dumb HTTP protocol did not work against WebDAV
+ servers that did not terminate a collection name with a slash.
+
* "git tag -v" did not work with GPG signatures in rfc1991 mode.
* The post-receive-email sample hook was accidentally broken in 1.7.3.3