Is there a way to detect (from a script) if the current working tree is in state 'merge'? Right now I had the case that a conflict resolution resulted in 'no pending changes'. As a result my "git --no-pager status --porcelain --untracked-files=no | tee $t" showed nothing, which skipped the required 'git commit' in my script. Thanks, Olaf