X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/bca2d01e18e69ae7b602950ee640a08ea1c8cef0..505846e878ec69d4b2880070dc98d88df339b9a3:/doc/sample_hooks/post-merge-unclobber diff --git a/doc/sample_hooks/post-merge-unclobber b/doc/sample_hooks/post-merge-unclobber index 017a13f..23c757c 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 '' {} \;