How to detect if a tree is in status "merge"?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Attachment: pgprgmGB5sNyK.pgp
Description: Digitale Signatur von OpenPGP


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux