gitworkflow

gitworkflow copied to clipboard

A post about stacked diffs: * https://jg.gg/2018/09/29/stacked-diffs-versus-pull-requests/ This is a very interesting approach that works quite well, and with a slight tweak (stacked branches vs stacked diffs), is not mutually...

rocketraman

https://github.com/tummychow/git-absorb could be a useful tool if it works well. Experiment with it, describe it, and link it.

rocketraman

The https://github.com/mhagger/git-when-merged tool is useful for gitworkflow. Describe it here, and link to it.

rocketraman

Links/scripts to rebuilding next & pu

2

Link to script to rebuild `next` based on topics currently in `next` Link to script to rebuild `pu` based on topics currently in `pu`

ninokierulf

In some cases, a branch may be merged into an integration branch as part of another topic. Generally, one should explicitly merge in dependent branches first, but in some cases...

rocketraman

Specify merging type from topic branch to master

1

Hi all, I found that there's a bit of confusion when you document the merging of a topic branch inside master, there is no description on what type of merging...

Mindexperiment

Git 2.18 has an option for interactive rebase called `--rebase-merges`, which will eventually replace the clunky `--preserve-merges`. This capability can be used to rebase a topic with merges interactively, and...

rocketraman

Git 2.19 has a cool feature called `range-diff` which can be used to diff two commit ranges e.g. two versions of a branch. This is really useful for git-workflow. See...

rocketraman

Add some simple scripts that can do things like described here: https://github.com/rocketraman/gitworkflow/issues/5

rocketraman

Here the script I mentioned in #3 Just take a look and tell me what you think about it.

sauerj