Traumflug
Traumflug
Uhm, this support for deltas in Configtool is still missing.
> What happens when you cherry-pick a commit from experimental to master, then rebase its substance away? (Answering myself with a test: git co master -b testa ; git cherry-pick...
> Git seems to know that the no-content commits are OK to drop. Yes, that's the case. BTW., Linus Thorvalds always stresses that commits arent's changes or patches, but a...
Big rebasing today, picked some 60 commits from experimental to master and rebased experimental as well as the branches I'm currently working on.
Found by accident and written by a guy similarly excited by rebasing: http://randyfay.com/content/rebase-workflow-git He investigated after he found merging to be somewhat dangerous with distributed SCM.
Just added the script _git-step-rebase_ to the _tools/_ folder. It reliefs from all the manual typing described above. Rebasing a topic branch step by step is now as simple as:...
P.S.: as this tool comes with a commit, it'll be removed when checking out an older branch. To resolve this, the tool has to be copied elsewhere until topic branches...
Another description of the same procedure: https://github.com/Traumflug/Teacup_Firmware/issues/211#issuecomment-216222419
> Some files using Tabs. Some spaces. Some are mixed. The goal is to have spaces only and indentation by 2 of them. Also to have no lines longer than...
> Maybe we could something like this? http://editorconfig.org/ As I tried to explain before, keeping the style isn't the problem.