DEV Community

Discussion on: Git workflow and my new love of Git alias

Collapse
 
jstocto profile image
jst-octo

Agreed. But you then also need to merge with --no-ff to avoid polluting your master. Renaming for public branches rebase is also a must to avoid push force drama.

Collapse
 
jstocto profile image
jst-octo

For aliases and shell/git configuration, a few pearls:

github.com/zsh-users/antigen
with oh-my-zsh/git and others according to your tastes. (♥ gloga)

grml.org/zsh/

github.com/zsh-users/zsh-autosugge...

github.com/iam4x/zsh-iterm-touchbar

--rebase by default on git pull is comfortable too.

Collapse
 
jstocto profile image
jst-octo

And obviously for those that didn't know it:
learngitbranching.js.org/