On Mon, Mar 17, 2014 at 2:40 PM, Jean-Marc Lasgouttes <lasgout...@lyx.org> wrote: > 17/03/2014 14:34, Jean-Marc Lasgouttes: > >> The branch, str-metrics, has been updated. >> discards c3600ccbf4c861035446cfbe77c57bbc48c455ab (commit) >> discards f6637dcbc89a67d0238f5979f7457f2bbc9c9e9b (commit) >> discards 5e609e9ea164ea248ea2a5f0dece75fc530419da (commit) >> discards 0e5267c9a63cb1e1f0894e50adfadd392bb9f460 (commit) >> discards 69117c39b6113a8d7e9e4a007d6970bde5b8864f (commit) >> discards 8f100e1d25490e24adc211a1093e66e08daf3349 (commit) > > ... > > I finally decided to rewrite all the history and produce a nice and clean > commit. The goal is to be ready to merge with master once 2.1 has been > released. By doing it know, I hope I will avoid walking on others' toes > (nobody told me they were working onm top of this and I always said this was > going to happen). > > JMarc\
I personally would prefer a series of nice and clean commits, which might be easier to parse by a human being than one 2725-lines-difff commit. Vincent
