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 /gitk-git | |
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 'gitk-git')
0 files changed, 0 insertions, 0 deletions