On 15/03/18 18:41, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > >> Stolee, you definitely want to inspect those changes (`git log --check` >> was introduced to show you whitespace problems). If all of those >> whitespace issues are unintentional, you can fix them using `git rebase >> --whitespace=fix` in the most efficient way. > > Another way that may be easier (depending on the way Derrick works) > is to fetch from me and start working from there, as if they were > the last set of commits that were sent to the list. "git log > --first-parent --oneline master..pu" would show where the tip of the > topic is. BTW, thanks for adding the 'SQUASH??? sparse fixes' on top of that branch - sparse is now quiet on the 'pu' branch. (The same can't be said of static-check.pl, but that is a different issue. ;-) ). Thanks! ATB, Ramsay Jones