projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9207c6d f66caaf)
Merge branch 'cb/leading-path-removal' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:08 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:08 +0000 (11:39 -0700)
commit55ea322617590995c57c06486884e50915cdfd3b
treec05b922b013d50f6c45a8ba97db6b7197a9aa609tree | snapshot
parent9207c6d6da9f8ead06f8bfb788c13e94d3082072commit | diff
parentf66caaf9c8e0feb840a439a58e165b963aec79cfcommit | diff
Merge branch 'cb/leading-path-removal' into next

* cb/leading-path-removal:
  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
cache.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.