| commit | 385cc9d8c44eb5be9d57e630129752a72c0a08c8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 20:46:14 +0000 (24 12:46 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Nov 2010 20:46:14 +0000 (24 12:46 -0800) | ||
| tree | 7f88fcd6c73d8391eae97f1f01e6c63e2abcb6a3 | treesnapshot (tar.gz zip) |
| parent | 6cf9bf6cbcfd57606da30710656b248651d3113f | commitdiff |
| parent | 8b130262fb7b5d09df2af63f47d9bff1da220bfb | commitdiff |
Merge branch 'aw/git-p4-deletion' into maint
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files
* aw/git-p4-deletion:
Fix handling of git-p4 on deleted files