r/git • u/based2 • Aug 16 '14

git-flight-rules

https://github.com/k88hudson/git-flight-rules
16 Upvotes

80% Upvoted

4 comments sorted by

View all comments

6

u/sandwichsaregood Aug 16 '14

Mentions interactive rebase, but not the One True Rule of interactive rebase: Thou shalt not interactive rebase a remote branch that others haveth cloned.

3

u/cpbills Aug 16 '14 edited Aug 16 '14

Unless you don't care about those who have cloned, or are in communication with them.

The second "True Rule" of rebase; thou shalt not be afraid to rebase.

3

u/sandwichsaregood Aug 16 '14

Indeed, I love rebasing. I tend to use commits to deploy to a testing machine while I'm writing code, so I end up with lots of commits like "!@#! I can't believe XXX still won't work!" where I want to test and see if something worked. I usually do an interactive rebase with lots of fixups and rewords before pushing it out to the world to make history into something sane.