Share your preferred every-day git workflow

[andreav]

This could be the place to share your preferred every-day git workflow.

[andreav]

Andrea every-day git workflow:

1. git ftrbr-start
2. .. edit .. commit ..
3. git rebase -i $(git intbr)
4. git ftr-push-rebase

I'm a rebase fan. That command helps keeping my history and repository history clean.

Point 3: interactive rebasing helps reordering MY COMMITS before pushing contributes. (Note it is parametrized on my current integration branch.)

Point 4: git ftr-push-rebase is particularly useful for keeping REPOSITORY HISTORY as clean as possible.

variant 1

If I often push more than one commit, mergeing --nof-ff could be better.

git config 4f.ftrbr-integrate-rebase-opt --no-ff

This can keep all my commits on a separate branch.

variant 2

If git ftr-push-rebase conflicts, I prefer resolving them by merges.

I'll rollback rebase by:

git rebase --abort

Then I'll use:

git ftr-push

resolve conflict, thus rendering this operation more evident in my history.

In the end, re-issue:

git ftr-push