summaryrefslogtreecommitdiff
path: root/delta-islands.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-02-05 14:26:10 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-02-05 14:26:10 -0800
commit40b8ba2c4458bd1ed6d32092712c07a4fc26e256 (patch)
tree7cef01f10ba730dc3f781fe49445581710ed4d8d /delta-islands.c
parentMerge branch 'jt/get-reference-with-commit-graph' (diff)
parentgit-p4: handle update of moved/copied files when updating a shelve (diff)
downloadtgif-40b8ba2c4458bd1ed6d32092712c07a4fc26e256.tar.xz
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
Diffstat (limited to 'delta-islands.c')
0 files changed, 0 insertions, 0 deletions