I have all of my mil and civilian time in one digital logbook.
The mil entries and time match as closely as possible to my AFORMS time -- no conversions/additions/changes if I can help it. The airlines generally understand the differences in time-keeping, so mil flights get logged by mil rules, civilian flights get logged by FAA rules. Simple.