summaryrefslogtreecommitdiff
path: root/git/hooks/post-merge
AgeCommit message (Collapse)AuthorFilesLines
2022-04-06Submodule update (CI fix)Jesusaves1-2/+2
2013-12-19Remove generated new from repo and add to post-merge scriptBen Longbons1-0/+1
2013-04-24Remove the old stuff about the directory movesBen Longbons1-1/+1
2011-06-21Make post-merge hook saferBen Longbons1-2/+5
2011-06-19Update submodule and add a git hookBen Longbons1-0/+13