Stupid Git tricks: Combining two files into one while preserving line history | Heykuki News