git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 09b2e40 7a10946)
Merge branch 'ld/git-p4-shelve-update-fix'
authorJunio C Hamano <redacted>
Tue, 5 Feb 2019 22:26:10 +0000 (14:26 -0800)
committerJunio C Hamano <redacted>
Tue, 5 Feb 2019 22:26:10 +0000 (14:26 -0800)
commit40b8ba2c4458bd1ed6d32092712c07a4fc26e256
tree7cef01f10ba730dc3f781fe49445581710ed4d8dtree | snapshot
parent09b2e40944f297d6cabe0fb0ce2e3a72e610f657commit | diff
parent7a10946ab9dd4692fc99d219f0cd4bc3d5e16d63commit | diff
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.py diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT