]> 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:

projects / code / vcsh.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 49a6af9) | patch
add sample hooks that allow cloning over extant files
authorCaleb Maclennan <caleb@alerque.com>
Sun, 20 Oct 2013 01:35:10 +0000 (19:35 -0600)
committerCaleb Maclennan <caleb@alerque.com>
Wed, 5 Feb 2014 12:45:10 +0000 (14:45 +0200)
commitbca2d01e18e69ae7b602950ee640a08ea1c8cef0
treeef42dfcd61adca7d7107f064ee8073eff6e786bdtree | snapshot
parent49a6af92db204536f6752583c1c24a34c1070c8ccommit | diff
add sample hooks that allow cloning over extant files

Cloning a repo over an existing set of files would usually
cause a merge conflict that aborts the process and requires
manual intervention. This pair of hooks handles that case
by manually moving the extant objects out of the way,
completing the checktout, then restoring them to their
original places. The resulting state is a set of unstaged
local changes.
doc/hooks diff | blob | history
doc/sample_hooks/post-merge-unclobber [new file with mode: 0755] blob
doc/sample_hooks/pre-merge-unclobber [new file with mode: 0755] blob
version controlled RC files

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.