chemeris/UHD-Fairwaves — comment on commit 92dd9d4a44680625837edcef17a6af0845d9e09d
File:  line 0
By chemeris:

Btw, I find these git tools very useful in my own practice:
* 'git rebase -i' - interactive rebase allows you to merge, split and reorder commits. Rebase is not recommended on a live branch, but in case of this branch I'd recommend you to use it to prettify commit log.
* 'git add -i' - interactive add. *Very* useful tool to check in only what you really want to check in. I even prefer it over "git citool" in many cases.

I also find that it's better to never 'git add' whole directories. It will prevent you from accidental check in of wrong files. Ad always double-check file list when you write commit message - file list to be checked in is shown there.

Speaking about this commit, Sylvain is right - it would be extremely helpful if you split it into logical pieces. Because we can merge .gitignore changes, but we're not going to merge deletion of all those files. This is a good idea in general, but it should be "mainlined" first. Otherwise it will be a nightmare to maintain for us - breaking automatic rebases. Also we must check that all those deleted files are generated correctly if you use Makefile for the build.

Could you please use use interactive rebase to fold, reorder and split commits into logical pieces? Then we could merge most commits into our branch and propose deletion of auto-generated files for inclusion into mainline. Think of commits in this branch as of a set of patches you're submitting to bug tracker.