3 ms·
I would suggest making use of 'git commit --fixup' or 'git commit --squash' which creates a commit that is specially-named such that you can later squash everyt
by cyphar 7y ago
I would suggest making use of 'git commit --fixup' or 'git commit --squash' which creates a commit that is specially-named such that you can later squash everything together with `git rebase --autosquash'. It's really transformed how I work on large patchsets.
- pertymcpert 7y agoGreat tip, thanks.
- toyg 7y agoYou da real mvp. It is ridiculous how many nice features git has accumulated through the years, but their discoverability is... not excellent -- partially because of how many options we now have. It's a vicious circle.
- vonseel 7y ago`git commit --fixup` very nice, I never particularly liked the workflow of "git rebase -i <hash>"
- beatgammit 7y agoEh, `git rebase -i master` (or some other branch) isn't so bad, or you can always rebase against origin/<your-branch>. But yes, --autosquash looks nice.