| commit | 40b8ba2c4458bd1ed6d32092712c07a4fc26e256 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 5 Feb 2019 22:26:10 +0000 (5 14:26 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 5 Feb 2019 22:26:10 +0000 (5 14:26 -0800) | ||
| tree | 7cef01f10ba730dc3f781fe49445581710ed4d8d | treesnapshot (tar.gz zip) |
| parent | 09b2e40944f297d6cabe0fb0ce2e3a72e610f657 | commitdiff |
| parent | 7a10946ab9dd4692fc99d219f0cd4bc3d5e16d63 | commitdiff |
Merge branch 'ld/git-p4-shelve-update-fix'
"git p4" failed to update a shelved change when there were moved
files, which has been corrected.
* ld/git-p4-shelve-update-fix:
git-p4: handle update of moved/copied files when updating a shelve
git-p4: add failing test for shelved CL update involving move/copy
"git p4" failed to update a shelved change when there were moved
files, which has been corrected.
* ld/git-p4-shelve-update-fix:
git-p4: handle update of moved/copied files when updating a shelve
git-p4: add failing test for shelved CL update involving move/copy
| git-p4.py | diff1 | diff2 | blobhistory |