2 ms·Stupid Git tricks: Combining two files into one while preserving line history1 points by fanf2 7y ago