X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/49a6af92db204536f6752583c1c24a34c1070c8c..bca2d01e18e69ae7b602950ee640a08ea1c8cef0:/doc/sample_hooks/post-merge-unclobber

diff --git a/doc/sample_hooks/post-merge-unclobber b/doc/sample_hooks/post-merge-unclobber
new file mode 100755
index 0000000..017a13f
--- /dev/null
+++ b/doc/sample_hooks/post-merge-unclobber
@@ -0,0 +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.
+
+find -name '*.vcsh-unclobber' -execdir rename .vcsh-unclobber '' {} \;