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