| commit | a6954452ecf757523b31d6eaaf7e00c7a2d91e46 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Aug 2007 08:37:10 +0000 (6 01:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Aug 2007 08:37:10 +0000 (6 01:37 -0700) | ||
| tree | 83019fdce5742e2c84ca2278835e8da1b629fe33 | treesnapshot (tar.gz zip) |
| parent | a76c2acb28146f5630592f2ba738c0ebf0f3c1c4 | commitdiff |
| parent | 93969438dca50c7f0039fcf35e7ab82776d4122f | commitdiff |
Merge branch 'maint'
* maint:
apply: remove directory that becomes empty by renaming the last file away
setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
* maint:
apply: remove directory that becomes empty by renaming the last file away
setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
| builtin-apply.c | diff1 | diff2 | blobhistory |
| setup.c | diff1 | diff2 | blobhistory |