Fossil SCM

← Back to file

www/branching.wiki

50 commits
Sync with trunk.
florian e4556126d… 2026-01-10 14:10
Sync with trunk.
florian facfbbd55… 2026-01-10 14:04
Sync with trunk.
florian c50c8ed9d… 2026-01-10 14:02
Sync with trunk.
florian b81b4c6c3… 2025-11-26 14:12
Merge from trunk.
brickviking 0ffacb525… 2025-10-23 08:14
Make use of the improved /help/CMD syntax everywhere, in place of the legacy /help?cmd=CMD syntax.
drh c64f28d26… 2025-10-10 17:20
Merge trunk into ui-local-diff branch, resolving one merge conflict in info.c:hexdump_page().
stephan d57463cc0… 2024-11-07 06:50
Sync with trunk.
florian 8e6660cd7… 2024-09-06 10:48
Sync with trunk.
florian 00f7466ad… 2024-09-06 10:47
Updates from trunk for sync changes et al.
andybradford 2304041e4… 2024-03-23 05:54
Merge trunk into markdown-tagrefs branch.
stephan 0517bd2dd… 2024-03-05 12:53
Assorted improvements to Pikchr handling in the docs under the new skin.
wyoung b3d99d926… 2024-02-18 14:08
Removed manual indents on command examples in the branching doc; the skin does that now.
wyoung ccd880e43… 2024-02-18 12:45
Modernized the default skin, primarily to improve readability, and forked off the old default as "É…
wyoung 8a1ba49b7… 2024-02-10 17:36
Replaced nearly all explicit uses of the "blockquote" tag in the embedded docs: * Constructs li…
wyoung 54977e141… 2024-02-04 04:29
Sync with trunk.
florian 759782533… 2024-01-22 13:40
Sync with trunk.
florian f05b04a62… 2024-01-22 13:39
Merge trunk into markdown-tagrefs branch and resolve conflict.
stephan fdd3fe21c… 2023-06-03 08:59
Merge updates from trunk.
mistachkin e3df21cdf… 2023-05-21 03:37
Cleaned up a few inconsistencies in the Pikchrs in the branching doc in an attempt to fix the small…
wyoung 239fb5b18… 2023-02-15 05:16
Merge updates from trunk.
mistachkin 6f3640a71… 2022-10-17 01:02
Merged trunk changes in. Only needed to track my own rename of branch_of_rid() to branch_of_ckin_r…
wyoung ea28708f8… 2021-03-01 07:37
Brought graham's ui-local-diff branch up to date with respect to trunk. This is not a simple merge,…
wyoung 0516f4d3c… 2021-02-14 21:28
Merge in trunk
george 7803cfeff… 2020-10-10 17:54
Added "toggle" attributes to the pikchrs in the branching and rebase harm docs, so they act as inli…
wyoung 01f6ed9c9… 2020-09-30 10:30
Update pikchr.c to the latest. This also required a small correction to text alignment in figure 6…
drh c3bb7cd22… 2020-09-12 02:24
In the branching.wiki document, make the figure numbers part of the Pikchr, thus avoiding the need …
drh 299e06435… 2020-09-11 19:58
Replace the last separate SVG file in branching.wiki with in-lin Pikchr. Also update pikchr.c to fi…
drh 9ec0ccee3… 2020-09-10 17:18
Merge in changes for the new /pikchrshow webpage.
drh 0b2f83888… 2020-09-10 16:19
Change 5 of the 6 diagrams in the "branching.wiki" document over to Pikchr.
drh 3c7f74263… 2020-09-10 03:10
Merge in trunk (version-2.12.1)
george 62c316306… 2020-08-26 13:31
Merge in trunk; resolve conflicts
ashepilko 7cfbf66a0… 2020-08-09 21:45
Editing pass on the branching.wiki doc. Mostly grammar and clarity improvements, but also added som…
wyoung f8d210aa1… 2020-07-16 17:30
Merge trunk
jan.nijtmans 69b450c1e… 2020-06-25 08:16
Merge trunk
jan.nijtmans 9dbea18c7… 2020-01-28 20:39
Merge in trunk
ashepilko 4d8aecdfc… 2020-01-09 17:57
Merge in latest from trunk.
andybradford aa3763911… 2019-08-31 16:42
Merge in recent developments on trunk.
andybradford 70d091eac… 2019-08-21 14:46
Merged recent spell check fixes into this branch so we don't revert any of them.
wyoung a9fd086f1… 2019-08-16 01:58
Another spell check pass on www/* using a different dictionary than in the prior pass. ([79c2cb083d…
wyoung 0996347d4… 2019-08-16 01:57
Merge in from trunk.
andybradford 0f9f2e403… 2019-08-10 15:34
Typo fix pass on www/*
wyoung 79c2cb083… 2019-08-08 04:23
Merge trunk
jan.nijtmans fc5f88d6d… 2019-08-04 22:56
Small fixes to branching.wiki
wyoung cdd5e576d… 2019-06-27 23:37
Assorted improvements to the new material in www/branching.wiki, mainly in the way of clarification…
wyoung 862b77b69… 2019-06-27 23:12
More clarifications in the "How Can Forks Divide Development Effort?" section of branching.wiki, pr…
wyoung 70a7db80f… 2019-06-22 03:46
Gave Users A thru E human names, and humanized their story a bit in the branching.wiki article.
wyoung 2ac5bc3c3… 2019-06-21 13:19
Typo fix
wyoung eed1ff610… 2019-06-21 12:26
Better internal links in www/branching.wiki to the new "How Can Forks Divide Development Effort?" s…
wyoung ed4475299… 2019-06-21 12:20
Clarified User C's view of the bad-fork situation in branching.wiki.
wyoung 8a794a5da… 2019-06-21 12:09

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button