]> git.madduck.net Git - code/vcsh.git/commit

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:

add hooks to enable auto handing of merge conflicts
authorCaleb Maclennan <caleb@alerque.com>
Sun, 20 Oct 2013 01:11:52 +0000 (19:11 -0600)
committerCaleb Maclennan <caleb@alerque.com>
Wed, 5 Feb 2014 12:36:00 +0000 (14:36 +0200)
commit49a6af92db204536f6752583c1c24a34c1070c8c
treeeadf76436ce601c5d21e0187cbac04c4585cbd29
parent890dbdede9545f927385bfd798f34831df3fc537
add hooks to enable auto handing of merge conflicts

These hooks before and after the actual checkout process
will enable a pair of hook scripts to automatically handle
conflicts and potentially allow the checkout of repositories
over existing file sets
doc/hooks
vcsh