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