Johannes Schindelin <johannes.schinde...@gmx.de> writes: > +------------ > +* Merge branch 'report-a-bug' > +|\ > +| * Add the feedback button > +* | Merge branch 'refactor-button' > +|\ \ > +| |/ > +| * Use the Button class for all buttons > +| * Extract a generic Button class from the DownloadButton one > +------------
Consider to put SHA1s into the diagram, as they are then used in explanaitions. Hopefully I got them right here: ------------ * 6f5e4d Merge branch 'report-a-bug' |\ | * abcdef Add the feedback button * | a1b2c3 Merge branch 'refactor-button' |\ \ | |/ | * 654321 Use the Button class for all buttons | * 123456 Extract a generic Button class from the DownloadButton one ------------ Original explanation, just for reference, unchanged: > +------------ > +label onto > + > +# Branch: refactor-button > +reset onto > +pick 123456 Extract a generic Button class from the DownloadButton one > +pick 654321 Use the Button class for all buttons > +label refactor-button > + > +# Branch: report-a-bug > +reset refactor-button # Use the Button class for all buttons > +pick abcdef Add the feedback button > +label report-a-bug > + > +reset onto > +merge -C a1b2c3 refactor-button # Merge 'refactor-button' > +merge -C 6f5e4d report-a-bug # Merge 'report-a-bug' > +------------ -- Sergey
