commit c72da327af6cd2fde74d7803b528dccf2af02ecc from: Omar Polo date: Thu Jul 28 12:51:47 2022 UTC warn about the interaction between got patch -p and -c suggested by stsp@ commit - 5f56d41e1acd9cce7202960acad0cab3516e9c26 commit + c72da327af6cd2fde74d7803b528dccf2af02ecc blob - 4e7fe9ac12d23a680dee56b299c0b2566d3c6da0 blob + fb5fa0ee9c49ef907bcaaf33aed748fe236e9d6a --- got/got.1 +++ got/got.1 @@ -1410,6 +1410,9 @@ as a merge base for 3-way merges, overriding the meta- In case no merge-base is available for a file .Cm got patch will attempt to apply the changes without doing a 3-way merge. +If +.Fl p +is used, the paths are stripped before being looked up. .It Fl n Do not make any modifications to the work tree. This can be used to check whether a patch would apply without issues.