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