diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-09-25 15:25:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-25 15:25:40 -0700 |
| commit | 9f4588d72b035714d4524342479e375742ac05b3 (patch) | |
| tree | 5dc6b95bf502b2b8d664567dbd2d006ef1acf765 /t/t4015-diff-whitespace.sh | |
| parent | Merge branch 'jx/proc-receive-hook' (diff) | |
| parent | git-p4: use HEAD~$n to find parent commit for unshelve (diff) | |
| download | tgif-9f4588d72b035714d4524342479e375742ac05b3.tar.xz | |
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
Diffstat (limited to 't/t4015-diff-whitespace.sh')
0 files changed, 0 insertions, 0 deletions