Merge branch 'ld/p4-unshelve' into jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Feb 2018 21:27:55 +0000 (13:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Feb 2018 21:27:55 +0000 (13:27 -0800)
commit1486ccfebe2e42629c1cf8deb4de8f9c15db954b
treee0c90355f20a998be56f342904b90b3d331231fe
parent16ee318bfb063dc1344f01e33e9e23c7c0db4370
parent4d1eca702c2ea3ec5443c97239350ff9ca8363de
Merge branch 'ld/p4-unshelve' into jch

"git p4" learned to "unshelve" shelved commit from P4.

* ld/p4-unshelve:
  git-p4: add unshelve command