| commit | 5ddab49db998cfee6ab9246eb440fd0c66966543 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Mar 2011 23:34:59 +0000 (17 16:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 Mar 2011 23:34:59 +0000 (17 16:34 -0700) | ||
| tree | 4cc9536879306a3eec391c0b722d37b37f90ca21 | treesnapshot (tar.gz zip) |
| parent | e717a840dd645e93cfd0fe2511a4d371e1fdcb61 | commitdiff |
| parent | e2a57aac8a8a2b786739a5a93ea9dcfd2f0fd0e2 | commitdiff |
Merge branch 'master' into next
* master:
Name make_*_path functions more accurately
Conflicts:
builtin/receive-pack.c
* master:
Name make_*_path functions more accurately
Conflicts:
builtin/receive-pack.c
| builtin/clone.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| environment.c | diff1 | diff2 | blobhistory |
| transport.c | diff1 | diff2 | blobhistory |