]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4013/diff.log_-m_-p_master
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c430a6 0acbf59)
Merge branch 'ld/p4-unshelve-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Sep 2020 22:25:40 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Sep 2020 22:25:40 +0000 (15:25 -0700)
commit9f4588d72b035714d4524342479e375742ac05b3
tree5dc6b95bf502b2b8d664567dbd2d006ef1acf765tree | snapshot
parent6c430a647cb990fc856d328733fa59e1fafadb97commit | diff
parent0acbf5997fa26747aec544d2ef6a27e4feb75e81commit | 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
Unnamed repository; edit this file 'description' to name the repository.