git annex fills up repository with uuid logs
sean at silentflame.com
Sat Dec 17 17:49:16 CET 2011
On 17 Dec 2011 at 13:59Z, Richard Hartmann wrote:
> You merged the branches master and git-annex.
The only merge command I typed was “git annex merge”—surely that should
do the right thing?
Is a revert, rebase or reset the best way to undo the damage I’ve done
> As a dirty hack to prevent you from typoing, you can create a
> .gitnomerge file with
> branch = master
> branch = git-annex
> that way, git will not be able to merge the branches without manual
> interaction when you ask it to.
Okay thanks for that, I’ll check that file in.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 835 bytes
Desc: not available
More information about the vcs-home