projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0137ef7 ada6a41)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 16:57:38 +0000 (08:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 16:58:09 +0000 (08:58 -0800)
commite6b71b32892bf1600e7edaab17426f634e7e5e5a
treef48d2e4be78744011599d5505642673077796743tree | snapshot
parent0137ef7dae553f9eb89cbae1ddb60b72046ba28bcommit | diff
parentada6a4117eb204fe14a83bc51daaf923cd8127eccommit | 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>
Documentation/RelNotes/1.7.4.txt diff1 | | blob | history
Makefile diff1 | diff2 | blob | history
Git—the stupid content tracker