X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/30e3b0e741f20d73e24978b4722dd58e7b3ef741..6d3e9d21d1bfa0a024bbf5758c6f6e55086deac8:/doc/sample_hooks/post-merge-unclobber diff --git a/doc/sample_hooks/post-merge-unclobber b/doc/sample_hooks/post-merge-unclobber index 017a13f..2b8f286 100755 --- a/doc/sample_hooks/post-merge-unclobber +++ b/doc/sample_hooks/post-merge-unclobber @@ -1,10 +1,10 @@ #!/bin/sh # This finds objects that the pre-merge script moved out of the way to -# avoid conflicts when running git clone and moves them back to their -# original places. The result is that the git repository gets checked out -# and the extant objects end up back in the working directory. Git now -# sees these as un-staged changes to the working branch and you can deal -# with them by adding them or reverting. +# avoid conflicts when running `vcsh clone` and moves them back to their +# original places. The result is that the Git repository gets checked out +# without error and the pre-existing files end up back in the working +# directory. Git and thus vcsh now see these as un-staged changes to the +# working branch and you can deal with them as usual. -find -name '*.vcsh-unclobber' -execdir rename .vcsh-unclobber '' {} \; +find . -name '*.vcsh-unclobber' -execdir rename .vcsh-unclobber '' {} \;