]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'sw/git-p4-unshelve-branched-files' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 21:27:15 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 21:27:15 +0000 (14:27 -0700)
commitfe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2
treed62ce076a39b37df4caaf93fc10155dd4f86b44d
parent2c30e34e1a50f9d14fce8f97f3639ac0ebccd819
parent0108f47eb30b9b473e044285b731e2fbca803170
Merge branch 'sw/git-p4-unshelve-branched-files' into maint

"git p4" update.

* sw/git-p4-unshelve-branched-files:
  git-p4: allow unshelving of branched files
git-p4.py
t/t9832-unshelve.sh