From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Dec 2016 23:27:49 +0000 (-0800)
Subject: Merge branch 'ld/p4-update-shelve'
X-Git-Tag: v2.12.0-rc0~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=031b5a9ad3e666554c321b34c4d6b63d04bdd9b3;p=thirdparty%2Fgit.git

Merge branch 'ld/p4-update-shelve'

* ld/p4-update-shelve:
  git-p4: support updating an existing shelved changelist
---

031b5a9ad3e666554c321b34c4d6b63d04bdd9b3