From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 17 Mar 2014 09:36:09 -0400 Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings" --- src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java index 06eb72a..00bac63 100644 --- a/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/EmptyRepositoryPage.java @@ -65,7 +65,8 @@ add(new Label("repository", repositoryName)); add(new RepositoryUrlPanel("pushurl", false, user, repository)); add(new Label("cloneSyntax", MessageFormat.format("git clone {0}", url))); - add(new Label("remoteSyntax", MessageFormat.format("git remote add gitblit {0}\ngit push gitblit master", url))); + add(new Label("remoteSyntax", MessageFormat.format("git remote add origin {0}\ngit push -u origin --all\ngit push -u origin --tags", url))); + add(new Label("upstreamSyntax", "git remote add upstream <upstream repository url>")); } @Override -- Gitblit v1.9.1