Recommitted Changed due to polluted branch

demos/git.html

@@ -40,6 +40,19 @@
     checkout main
     merge newbranch
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Simple "branch and merge" (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch newbranch
+      checkout newbranch
+      commit
+      checkout main
+      merge newbranch
+      </pre
+    >
     <h2>Continuous development graph</h2>
     <pre class="mermaid">
     ---
@@ -73,6 +86,23 @@
     checkout main
     merge develop
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Continuous development (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch develop
+      checkout develop
+      commit
+      checkout main
+      merge develop
+      checkout develop
+      commit
+      checkout main
+      merge develop
+      </pre
+    >
     <h2>Merge feature to advanced main graph</h2>
     <pre class="mermaid">
     ---
@@ -100,6 +130,20 @@
     commit
     merge newbranch
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Merge feature to advanced main (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch newbranch
+      checkout newbranch
+      commit
+      checkout main
+      commit
+      merge newbranch
+      </pre
+    >
     <h2>Two-way merges</h2>
     <pre class="mermaid">
     ---
@@ -137,6 +181,25 @@
     checkout main
     merge develop
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Two-way merges (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch develop
+      checkout develop
+      commit
+      checkout main
+      merge develop
+      commit
+      checkout develop
+      merge main
+      commit
+      checkout main
+      merge develop
+      </pre
+    >
     <h2>Cherry-pick from branch graph</h2>
     <pre class="mermaid">
     ---
@@ -170,6 +233,22 @@
     checkout main
     cherry-pick id: "Pick me"
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Cherry-pick from branch (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch newbranch
+      checkout newbranch
+      commit id: "Pick me"
+      checkout main
+      commit
+      checkout newbranch
+      commit
+      checkout main
+      cherry-pick id: "Pick me"
+    </pre>
     <h2>Cherry-pick from main graph</h2>
     <pre class="mermaid">
     ---
@@ -199,6 +278,21 @@
     commit
     cherry-pick id: "A"
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Cherry-pick from main (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch develop
+      commit
+      checkout main
+      commit id:"A"
+      checkout develop
+      commit
+      cherry-pick id: "A"
+      </pre
+    >
     <h2>Cherry-pick then merge graph</h2>
     <pre class="mermaid">
     ---
@@ -234,6 +328,24 @@
     cherry-pick id: "Pick me"
     merge newbranch
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Cherry-pick then merge (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch newbranch
+      checkout newbranch
+      commit id: "Pick me"
+      checkout main
+      commit
+      checkout newbranch
+      commit
+      checkout main
+      cherry-pick id: "Pick me"
+      merge newbranch
+      </pre
+    >
     <h2>Merge from main onto undeveloped branch graph</h2>
     <pre class="mermaid">
     ---
@@ -261,6 +373,20 @@
     checkout develop
     merge main
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Merge from main onto undeveloped branch (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch develop
+      commit
+      checkout main
+      commit
+      checkout develop
+      merge main
+      </pre
+    >
     <h2>Merge from main onto developed branch graph</h2>
     <pre class="mermaid">
     ---
@@ -290,6 +416,21 @@
     commit
     merge main
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Merge from main onto developed branch (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      branch develop
+      commit
+      checkout main
+      commit
+      checkout develop
+      commit
+      merge main
+      </pre
+    >
     <h2>Two branches from same commit graph</h2>
     <pre class="mermaid">
     ---
@@ -323,6 +464,23 @@
     checkout feature-001
     merge feature-002
     </pre>
+    <pre class="mermaid">
+      ---
+      title: Two branches from same commit (bottom-to-top)
+      ---
+      gitGraph BT:
+      commit
+      commit
+      branch feature-001
+      commit
+      commit
+      checkout main
+      branch feature-002
+      commit
+      checkout feature-001
+      merge feature-002
+      </pre
+    >
     <h2>Three branches and a cherry-pick from each graph</h2>
     <pre class="mermaid">
     ---
@@ -372,6 +530,30 @@
     commit id:"C"
     merge featureA
     </pre>
+    <pre class="mermaid">
+    ---
+    title: Three branches and a cherry-pick from each (bottom-to-top)
+    ---
+    gitGraph BT:
+    commit id: "ZERO"
+    branch develop
+    commit id:"A"
+    checkout main
+    commit id:"ONE"
+    checkout develop
+    commit id:"B"
+    branch featureA
+    commit id:"FIX"
+    commit id: "FIX-2"
+    checkout main
+    commit id:"TWO"
+    cherry-pick id:"A"
+    commit id:"THREE"
+    cherry-pick id:"FIX"
+    checkout develop
+    commit id:"C"
+    merge featureA
+    </pre>
     <script type="module">
       import mermaid from './mermaid.esm.mjs';
       const ALLOWED_TAGS = [