Documentation

James Moger

2014-03-06 2f8b4fe549e6c346a82db3ddf6f0dc6a7ee34939

 src/main/java/com/gitblit/wicket/pages/TicketPage.java

@@ -1260,7 +1260,7 @@
      String ticketBranch  = Repository.shortenRefName(PatchsetCommand.getTicketBranch(ticket.number));



      String step1 = "git fetch";

      String step2 = MessageFormat.format("git checkout {0} && git pull -ff-only\nOR\ngit checkout {0} && git reset --hard origin/{0}", ticketBranch);

      String step2 = MessageFormat.format("git checkout {0} && git pull --ff-only\nOR\ngit checkout {0} && git reset --hard origin/{0}", ticketBranch);



      panel.add(new Label("gitPreStep1", step1));

      panel.add(new Label("gitPreStep2", step2));