]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d4fdeed c3f2358)
Merge branch 'mm/p4-unshelve-windows-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:19 +0000 (10:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:19 +0000 (10:15 -0700)
commitadd59c4708cd629a6ee3175f0e0a796cc9b6db28
tree83364d0d985278fdf7dd9b729d8d8123b576c5e9tree | snapshot
parentd4fdeed00639b27c45856dfef338d46ec60b419ecommit | diff
parentc3f2358de39a8ac754ae68880a992835a84a6f0ccommit | diff
Merge branch 'mm/p4-unshelve-windows-fix'

The command line to invoke a "git cat-file" command from inside
"git p4" was not properly quoted to protect a caret and running a
broken command on Windows, which has been corrected.

* mm/p4-unshelve-windows-fix:
  p4 unshelve: fix "Not a valid object name HEAD0" on Windows
git-p4.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.