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 /commit-graph.h | |
| parent | 6c430a647cb990fc856d328733fa59e1fafadb97 (diff) | |
| parent | 0acbf5997fa26747aec544d2ef6a27e4feb75e81 (diff) | |
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 'commit-graph.h')
0 files changed, 0 insertions, 0 deletions