aboutsummaryrefslogtreecommitdiff
path: root/doc/bugs/merge_causes_out_of_memory_on_large_repos/comment_1_6d47485728ea65a9b555f8be7159dea5._comment
blob: f87a9a84d1d725b014c72b656e45ef9a1762eb4d (plain)
1
2
3
4
5
6
7
8
9
10
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawnxlx1UrzVhdy6_gFjzmF42x6QXxBUxg00"
 nickname="Jakukyo"
 subject="pre-commit hook of git annex"
 date="2013-09-11T00:58:09Z"
 content="""
The pre-commit hook of git annex throws an 'out of memory' error, too.

As a workaround, I've deleted ~/.git/hooks/pre-commit, and use `git merge` manually.
"""]]