diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-14 08:57:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 08:58:09 -0800 |
| commit | e6b71b32892bf1600e7edaab17426f634e7e5e5a (patch) | |
| tree | f48d2e4be78744011599d5505642673077796743 /Documentation | |
| parent | t800?-blame.sh: retitle uniquely (diff) | |
| parent | Prepare for 1.7.3.4 (diff) | |
| download | tgif-e6b71b32892bf1600e7edaab17426f634e7e5e5a.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 1.7.3.4
use persistent memory for rejected paths
do not overwrite files in leading path
lstat_cache: optionally return match_len
add function check_ok_to_remove()
t7607: add leading-path tests
t7607: use test-lib functions and check MERGE_HEAD
Do not link with -lcrypto under NO_OPENSSL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.3.4.txt | 10 | ||||
| -rw-r--r-- | Documentation/RelNotes/1.7.4.txt | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Documentation/RelNotes/1.7.3.4.txt b/Documentation/RelNotes/1.7.3.4.txt index 925178f608..c2a46a2e96 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 diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt index 6084f7ddf6..c1ed23a0c6 100644 --- a/Documentation/RelNotes/1.7.4.txt +++ b/Documentation/RelNotes/1.7.4.txt @@ -96,11 +96,6 @@ Fixes since v1.7.3 All of the fixes in v1.7.3.X maintenance series are included in this release, unless otherwise noted. - * "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 log --author=me --author=her" did not find commits written by me or by her; instead it looked for commits written by me and by her, which is impossible. |