Merge branch 'git:gh-pages' into fix/video-order

Author: Paulie-Aditya

Gemfile.lock

@@ -40,7 +40,7 @@ GEM
     parslet (2.0.0)
     public_suffix (6.0.1)
     racc (1.8.1)
-    rexml (3.4.1)
+    rexml (3.4.2)
     rss (0.3.1)
       rexml
     sawyer (0.9.2)
@@ -91,7 +91,7 @@ CHECKSUMS
   parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606
   public_suffix (6.0.1) sha256=61d44e1cab5cbbbe5b31068481cf16976dd0dc1b6b07bd95617ef8c5e3e00c6f
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
-  rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
+  rexml (3.4.2) sha256=1384268554a37af5da5279431ca3f2f37d46f09ffdd6c95e17cc84c83ea7c417
   rss (0.3.1) sha256=b46234c04551b925180f8bedfc6f6045bf2d9998417feda72f300e7980226737
   sawyer (0.9.2) sha256=fa3a72d62a4525517b18857ddb78926aab3424de0129be6772a8e2ba240e7aca
   uri (1.0.3) sha256=e9f2244608eea2f7bc357d954c65c910ce0399ca5e18a7a29207ac22d8767011

content/cheat-sheet/_index.html

@@ -133,7 +133,7 @@ <h3>List branches:</h3>
     </div>
     <div class="item">
       <h3>List branches by most recently committed to:</h3>
-      <code>git branch --sort=-committerdate</code>
+      <code>git branch <span style="white-space: nowrap;">--sort=-committerdate</span></code>
     </div>
     <div class="item">
       <h3>Delete a branch:</h3>
@@ -344,8 +344,8 @@ <h3>Combine with rebase:</h3>
             D [label="D", style="dashed", color="#f14e32", pos="2,0!"];
             E [label="E", style="dashed", color="#f14e32", pos="3,0!"];
 
-            D2 [label="D", color="#f14e32", pos="3,1!"];
-            E2 [label="E", color="#f14e32", pos="4,1!"];
+            D2 [label="D&#x2032;", color="#f14e32", pos="3,1!"];
+            E2 [label="E&#x2032;", color="#f14e32", pos="4,1!"];
 
 
             main_label [label="main", shape=plaintext, pos="2,2!", fixedsize=false];
@@ -510,7 +510,7 @@ <h3>Combine with squash merge:</h3>
             C [label="C", pos="2,1!"];
             D [label="D", color="#f14e32", pos="2,0!"];
             E [label="E", color="#f14e32", pos="3,0!"];
-            S [label="D\nE", color="#f14e32", pos="3,1!", width=0.6, height=0.8];
+            S [label="D&#x2032;\nE&#x2032;", color="#f14e32", pos="3,1!", width=0.6, height=0.8];
 
             main_label [label="main", shape=plaintext, pos="5,1!", fixedsize=false];
             main_label -> S [dir=forward];
@@ -655,7 +655,7 @@ <h3>Copy one commit onto the current branch:</h3>
         A [label="A", pos="0,1!"];
         B [label="B", pos="1,1!"];
         C [label="C", pos="2,1!"];
-        D2 [label="D", color="#f14e32", pos="3,1!"];
+        D2 [label="D&#x2032;", color="#f14e32", pos="3,1!"];
 
         D [label="D", color="#f14e32", pos="2,0!"];
         E [label="E", pos="3,0!"];