From: Olaf Hering <olaf@aepfle.de>
Date: Sun, 08 Dec 2019 10:55:17 GMT
Subject: How to detect if a tree is in status "merge"?
Message-ID: <20191208115517.6b319a44.olaf@aepfle.de>

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