projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c193a79 c14417c)
Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Aug 2009 20:34:37 +0000 (13:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Aug 2009 20:34:37 +0000 (13:34 -0700)
commit2459c20ed5583aaaa6afcef53823a416fc150b73
treebd1618d4badb18b1ca2ba13b48832910d84976cftree | snapshot
parentc193a79c305f36a15b0523bcd975fe0d7e4fdc5fcommit | diff
parentc14417c4f5f8d7765e232f1e908b85d2ae14ec34commit | diff
Merge branch 'master' into next

* master:
  t/Makefile: include config.mak
  tests: allow user to specify trash directory location
  tests: provide $TRASH_DIRECTORY variable
  tests: use "$TEST_DIRECTORY" instead of ".."
  t0001-init: split the existence test from the permission test
  t0001-init: fix a file name
Unnamed repository; edit this file 'description' to name the repository.