From 6be80398ba815192ecef3ada32b2b0f6bf7f74cf Mon Sep 17 00:00:00 2001
From: Carsten Lenz <clenz2@csc.com>
Date: Fri, 13 Jun 2014 08:25:48 -0400
Subject: [PATCH] Add german translation of EmptyrepositoryPage.html
---
src/site/tickets_using.mkd | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/site/tickets_using.mkd b/src/site/tickets_using.mkd
index 7d9e569..3cda731 100644
--- a/src/site/tickets_using.mkd
+++ b/src/site/tickets_using.mkd
@@ -28,7 +28,7 @@
...add a single commit...
git push origin HEAD:refs/for/new
# read ticket id from server output
- git branch --set-upstream-to=origin/ticket/{id}
+ git branch -u origin/ticket/{id}
### Creating the first Patchset for an Existing Ticket
@@ -42,7 +42,7 @@
cd repo
git checkout -b ticket/{id}
...add one or more commits...
- git push --set-upstream origin ticket/{id}
+ git push -u origin ticket/{id}
### Safely adding commits to a Patchset for an Existing Ticket
@@ -148,7 +148,7 @@
### Merging Patchsets
-The Gitblit web ui offers a merge button which *should work* but is not fully tested. Gitblit does verify that you can cleanly merge a patchset to the integration branch.
+The Gitblit web ui offers a merge button which will work for clean merges of a patchset to the integration branch.
There are complicated merge scenarios for which it may be best to merge using your Git client. There are several ways to do this, here is a safe merge strategy which pulls into a new branch and then fast-forwards your integration branch, assuming you were happy with the pull (merge).
--
Gitblit v1.9.1