commit ef0937d6aa633a60c254ef9ab536c2da4ac6ac14 from: Omar Polo via: Thomas Adam date: Thu Jul 28 14:37:38 2022 UTC warn about the interaction between got patch -p and -c suggested by stsp@ commit - 7d8bcb99cc69666c8317a8c1cadc8dc5885a7a77 commit + ef0937d6aa633a60c254ef9ab536c2da4ac6ac14 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.