]> git.madduck.net Git - code/vcsh.git/blobdiff - doc/sample_hooks/post-merge-unclobber

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge pull request #144 from mirabilos/patch-1
[code/vcsh.git] / doc / sample_hooks / post-merge-unclobber
index 23c757c08432f46f01ec07ba71fc1cb887378ad4..2b8f286053b445324ae31694f8559c6b90a130b0 100755 (executable)
@@ -7,4 +7,4 @@
 # directory. Git and thus vcsh now see these as un-staged changes to the
 # working branch and you can deal with them as usual.
 
 # 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 '' {} \;