Back to <til> Today I learned

Popular git config options

Yeah, another hightlight from HN. This time Julia Evans (I have her in my syndication list, but saw her post from HN), shared a very interesting list of pupular git config options, source

My favorite was:

git config --global merge.conflictStyle zdiff3

which shows the conflicts using this format:

<<<<<<< HEAD
def parse(input):
    return input.split("\n")
||||||| b9447fc
def parse(input):
    return input.split("\n\n")
=======
def parse(text):
    return text.split("\n\n")
>>>>>>> somebranch

The section between |||||| and ==== is the code before the HEAD and somebranch which is really cool to see because normally you can’t decide without knowing how it was before.

Back to <til> Today I learned

Posts by me

Kernel mods with eBFP

Friday, July 19 2024 was a very interesting day, several Windows machines were down showing the blue screen of death. The problem was caused by a software update from a security company named Crowdstrike, which was installed on all the …

Read

Recurrency notation RFC-5545

I learn about the https://datatracker.ietf.org/doc/html/rfc5545 From the specification: This document defines the iCalendar data format for representing and exchanging calendaring and scheduling information such as events, to-dos, journal …

Read

Log Search Utility

I found out in HN about logdy which is a web UI for displaying logs from the stdin to a browser, pretty neat. and reading in the comments also learn about lnav pretty cool tool too (three double oo words 😀).

Read