From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Sep 2020 22:25:40 +0000 (-0700)
Subject: Merge branch 'ld/p4-unshelve-fix'
X-Git-Tag: v2.29.0-rc0~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f4588d72b035714d4524342479e375742ac05b3;p=thirdparty%2Fgit.git

Merge branch 'ld/p4-unshelve-fix'

The "unshelve" subcommand of "git p4" used incorrectly used
commit^N where it meant to say commit~N to name the Nth generation
ancestor, which has been corrected.

* ld/p4-unshelve-fix:
  git-p4: use HEAD~$n to find parent commit for unshelve
  git-p4 unshelve: adding a commit breaks git-p4 unshelve
---

9f4588d72b035714d4524342479e375742ac05b3