| commit | 95f97567c1887d77f3a46b42d8622c76414d964d | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 13 Aug 2006 01:41:04 +0000 (12 18:41 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 13 Aug 2006 01:41:04 +0000 (12 18:41 -0700) | ||
| tree | 100f1a205af08f7179348b6412ebe1876feb41e2 | treesnapshot (tar.gz zip) |
| parent | 74229abc4b9b43155065788f9e7cee19264748d8 | commitdiff |
| parent | eed94a570e0421175d6b4342c0ac48e03ceedf0b | commitdiff |
Merge branch 'js/c-merge-recursive' into next
* js/c-merge-recursive:
t/t4013: fix futzing with the version string.
Better error message when we are unable to lock the index file
git-am: give better diagnostics when the patch does not apply during --3way
git-svn: split the path from the url correctly with limited perms
upload-pack: fix timeout in create_pack_file
* js/c-merge-recursive:
t/t4013: fix futzing with the version string.
Better error message when we are unable to lock the index file
git-am: give better diagnostics when the patch does not apply during --3way
git-svn: split the path from the url correctly with limited perms
upload-pack: fix timeout in create_pack_file
| builtin-checkout-index.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |