diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-14 19:57:38 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 19:58:09 +0300 |
| commit | e6b71b32892bf1600e7edaab17426f634e7e5e5a (patch) | |
| tree | f48d2e4be78744011599d5505642673077796743 /Documentation/RelNotes/1.7.4.txt | |
| parent | 0137ef7dae553f9eb89cbae1ddb60b72046ba28b (diff) | |
| parent | ada6a4117eb204fe14a83bc51daaf923cd8127ec (diff) | |
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/RelNotes/1.7.4.txt')
| -rw-r--r-- | Documentation/RelNotes/1.7.4.txt | 5 |
1 files changed, 0 insertions, 5 deletions
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. |