3 ms·Stupid Git tricks: Combining two files into one while preserving line history5 points by zdw 7y ago