Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Prepare for 1.7.3.4
author
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Dec 2010 15:51:35 +0000
(07:51 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Dec 2010 16:55:52 +0000
(08:55 -0800)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes/1.7.3.4.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
3055d78
)
diff --git
a/Documentation/RelNotes/1.7.3.4.txt
b/Documentation/RelNotes/1.7.3.4.txt
index 925178f6089fbeff38add340563d803bc65a7365..c2a46a2e96b9b5c415282dfaca39092d06067c86 100644
(file)
--- 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").
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.
* "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 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.
* 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
* "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