Yearly Archives: 2018

Git tip – restoring “lost” commits

I ran into a git issue today where I thought I was ready to push a recent commit, and the push failed, saying that I was in the middle of a rebase. I don’t remember starting a rebase, but maybe I did. I tried git rebase –continue, but that didn’t work, so then I tried […]

Posted in wordpress | Comments Off on Git tip – restoring “lost” commits

UNIX tip of the day: two file processing with AWK

I recently came across some AWK code from a work colleague that I did not understand at all awk -F’\t’ -v OFS=’\t’ ‘FNR==NR{a[$1]=$1;next};$1 in a{print $1,$2,$3}’ file1 file2 I usually like to understand code instead of blindly copying and pasting, so I did a little research into what this was doing. Searching for “awk FNR […]

Posted in wordpress | Comments Off on UNIX tip of the day: two file processing with AWK