Merge pull request #131 from ghedo/_vcsh

[code/vcsh.git] / doc / sample_hooks / post-merge-unclobber

diff --git a/doc/sample_hooks/post-merge-unclobber b/doc/sample_hooks/post-merge-unclobber
index 017a13fc50dcc0484f60497f7409cac8c3d07769..2b8f286053b445324ae31694f8559c6b90a130b0 100755 (executable)
--- 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
 #!/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 '' {} \;