Git: Using Advanced Rebase Features for a Clean Repository

Re:Git: Using Advanced Rebase Features for a Clean Repository by cdevs on Wednesday August 09, 2017 @07:36AM (#14967534)

I tell everyone to save/commit as much as possible , I don't want to hear I lost 2 weeks of work. After words I just squash the gesture into master named after whatever the short feature is "feature modal","new admin view" whatever...git history without squash or debase is a nightmare when everyone has commits like "typo 1" "typo2".

[ Parent | on HN ]

Re:Git: Using Advanced Rebase Features for a Clean Repository by nothrabannosir on Wednesday August 09, 2017 @07:41AM (#14967564)

Try selling git commit --squash or --fixup. Your colleagues can use this without actually rebasing, and you can help them out with the final step by doing the rebase. Especially when you have:

    git config --global rebase.autoSquash true

These commits are generally much easier to deal with than typo123 ones. But ymmv.

[ Parent | on HN ]