git annex fills up repository with uuid logs

[Sean Whitton]

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
here?

> As a dirty hack to prevent you from typoing, you can create a
> .gitnomerge file with

> branch = master

> and

> 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.

S
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.madduck.net/pipermail/vcs-home/attachments/20111217/40ccfaaf/attachment.pgp>