Merge branch 'gh-pages' into mkt-trim-commands

Author: kuychaco

css/explaingit.css

@@ -168,7 +168,7 @@ span.cmd {
   padding-left: 15px;
   color: #FFF;
   line-height: 14px;
-  background: url(../images/prompt.gif) no-repeat left center black;
+  background: url(../images/prompt.gif) no-repeat left top black;
 }
 
 .control-box input[type="text"] {
@@ -304,7 +304,7 @@ g.branch-tag.remote-branch > rect {
 g.branch-tag > text {
   text-anchor: middle;
   fill: #000;
-  font-size: 11px;
+  font-size: 15px;
   font-family: Arial;
 }
 
@@ -317,7 +317,7 @@ g.head-tag > rect {
 g.head-tag > text {
   text-anchor: middle;
   fill: #000;
-  font-size: 11px;
+  font-size: 15px;
   font-family: Arial;
   font-weight: bold;
   text-transform: uppercase;

js/controlbox.js

@@ -227,6 +227,32 @@ function(_yargs, d3, demos) {
 
       document.getElementById('last-command').textContent = entry
 
+      if (entry.trim() === 'help' || entry.trim() === 'help()') {
+        this.info('pres() = Turn on presenter mode')
+        this.info('undo = Undo the last git command')
+        this.info('redo = Redo the last undone git command')
+        this.info('mode = Change mode')
+        this.info('clear = Clear the history pane and reset the visualization')
+        this.info()
+        this.info('Available Git Commands:')
+        this.info('`git branch`')
+        this.info('`git checkout`')
+        this.info('`git cherry_pick`')
+        this.info('`git commit`')
+        this.info('`git fetch`')
+        this.info('`git log`')
+        this.info('`git merge`')
+        this.info('`git pull`')
+        this.info('`git push`')
+        this.info('`git rebase`')
+        this.info('`git reflog`')
+        this.info('`git reset`')
+        this.info('`git rev_parse`')
+        this.info('`git revert`')
+        this.info('`git tag`')
+        return
+      }
+
       if (entry === 'pres()') {
         window.pres()
         return
@@ -371,7 +397,9 @@ function(_yargs, d3, demos) {
         return this.error("'git log' can take at most one argument in this tool")
       }
       var logs = this.getRepoView().getLogEntries(args[0] || 'head')
-        .map(l => `<span class='log-entry'>&gt; ${l}</span>`).join('')
+        .map(function(l) {
+          return "<span class='log-entry'>&gt; " + l + "</span>"
+        }).join('')
       this.info(logs)
     },
 
@@ -879,7 +907,9 @@ function(_yargs, d3, demos) {
       } else if (subcommand === "show") {
         var logs = this.getRepoView().getReflogEntries(ref)
         this.info(
-          logs.map(l => `<span class='reflog-entry'>&gt; ${l}</span>`).join('')
+          logs.map(function(l) {
+            return "<span class='reflog-entry'>&gt; " + l + "</span>"
+          }).join('')
         )
       } else if (subcommand === "expire" || subcommand === "delete") {
         this.info("Real git reflog supports the '" + subcommand +

js/historyview.js

@@ -844,6 +844,12 @@ define(['d3'], function() {
       return tagData;
     },
 
+    _walkCommit: function (commit) {
+      commit.branchless = false
+      commit.parent && this._walkCommit(this.getCommit(commit.parent))
+      commit.parent2 && this._walkCommit(this.getCommit(commit.parent2))
+    },
+
     _markBranchlessCommits: function() {
       var branch, commit, parent, parent2, c, b;
 
@@ -859,13 +865,7 @@ define(['d3'], function() {
           parent = this.getCommit(commit.parent);
           parent2 = this.getCommit(commit.parent2);
 
-          function walkCommit (commit) {
-            commit.branchless = false
-            commit.parent && walkCommit.call(this, this.getCommit(commit.parent))
-            commit.parent2 && walkCommit.call(this, this.getCommit(commit.parent2))
-          }
-
-          walkCommit.call(this, commit)
+          this._walkCommit(commit)
         }
       }
 
@@ -926,7 +926,7 @@ define(['d3'], function() {
 
       newTags.append('svg:rect')
         .attr('width', function(d) {
-          return (d.name.length * 6) + 10;
+          return (d.name.length * 8) + 20;
         })
         .attr('height', 20)
         .attr('y', function(d) {
@@ -1479,7 +1479,7 @@ define(['d3'], function() {
               this.reset(origBranch)
               this._setCurrentBranch(origBranch)
               this.addReflogEntry(
-                'HEAD', this.getCommit('HEAD').id, 'rebase finished: returning to resf/heads/' + origBranch
+                'HEAD', this.getCommit('HEAD').id, 'rebase finished: returning to refs/heads/' + origBranch
               )
               this.addReflogEntry(
                 origBranch, newHeadCommit.id, 'rebase finished: refs/heads/' +