To have a good patch for review with extended number of context lines:  $ git diff -U600 > your_readable_patch.diff   But this patch will likely will fail applying to slightly different source code. Context lines should be stripped:  $ combinediff -U 3 ./big.diff /dev/null > small.patch