3 ms·
Hmm. This sounds like my workflow with gerrit, which goes like this: - each work item has its own branch. When pushed, gerrit turns this into a review. - a gi
by pjc50 6y ago
Hmm. This sounds like my workflow with gerrit, which goes like this:
- each work item has its own branch. When pushed, gerrit turns this into a review.
- a git alias, "alias.fixlast=commit -a --amend --no-edit" which amends the last commit to match the working directory
Plus these configurations:
branch.autosetuprebase=local
branch.autosetupmerge=always
pull.rebase=true
The effect is that every branch I create off the main "develop" branch is automatically set up to rebase from that branch when I do "git pull". So when I get some review comments for review "xyz", I just do checkout - pull - make changes - fixup - push.
Gerrit's workflow is slighly unusual in that each review must be a single git change, but it keeps a history of its own of previous changes you made to that review.