]> git.madduck.net Git - code/vcsh.git/blob - 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:

Revert ".travis.yml: Try to work around Travis CI"
[code/vcsh.git] / doc / sample_hooks / post-merge-unclobber
1 #!/bin/sh
2
3 # This finds objects that the pre-merge script moved out of the way to
4 # avoid conflicts when running `vcsh clone` and moves them back to their
5 # original places. The result is that the Git repository gets checked out
6 # without error and the pre-existing files end up back in the working
7 # directory. Git and thus vcsh now see these as un-staged changes to the
8 # working branch and you can deal with them as usual.
9
10 find . -name '*.vcsh-unclobber' -execdir rename .vcsh-unclobber '' {} \;