When working locally you can do something similar with -U<n> and I've also found using --patience can sometimes generate cleaner patches.