Liquid Exception: No such file or directory - git rev-parse HEAD in /_layouts/default.html

[rdyar]

not sure if this is it, but did you check those 2 files listed? see if there is a git message in there. I think that if there is a git conflict it will leave a message around the offending area and maybe jekyll is choking on that.