Resolves #486 -- easier to understand button labels when interactive rebasing

src/js/views/rebaseView.js

@@ -164,7 +164,6 @@ var RebaseEntryView = Backbone.View.extend({
   },
 
   render: function() {
-    var json = this.model.toJSON();
     this.$el.append(this.template(this.model.toJSON()));
 
     // hacky :( who would have known jquery barfs on ids with %'s and quotes

src/style/main.css

@@ -770,6 +770,19 @@ li.rebaseEntry a#toggleButton {
 li.rebaseEntry.notPicked {
   opacity: 0.2;
 }
+
+li.rebaseEntry.notPicked span.showWhenPicked {
+  display: none;
+}
+
+li.rebaseEntry span.showWhenNotPicked {
+  display: none;
+}
+
+li.rebaseEntry.notPicked span.showWhenNotPicked {
+  display: inline;
+}
+
 /* Modal Views */
 
 div.modalView.box.inFront.show {

src/template.index.html

@@ -394,7 +394,7 @@
       <% if (solutionOrder && solutionOrder.length) { %>
         <p class="solutionText">
           For the solution, order the commits as
-            <%= solutionOrder.join(', ') %>
+            <%= solutionOrder.join(', ') %>. You may need to omit or pick commits.
         </p>
       <% } %>
       <p class="helperText">
@@ -452,7 +452,12 @@
           <%= id %>
         </span>
         <a id="toggleButton" class="uiButton uiButtonPink">
-          Pick
+          <span class="showWhenPicked">
+            Omit
+          </span>
+          <span class="showWhenNotPicked">
+            Pick
+          </span>
         </a>  
       </div>
     </li>