From db55d13f5f4b641a9390076ced6b1775bcfcd6f6 Mon Sep 17 00:00:00 2001 From: Mathias Kinzler Date: Thu, 7 Oct 2010 11:37:16 +0200 Subject: Add "Pull" command This is the minimal implementation of a "Pull" command. It does not have any parameters besides the generic progress monitor and timeout. It works on the currently checked-out branch and assumes that the configuration contains the keys "branch..remote" and "branch..merge" to determine the remote configuration for the fetch and the remote branch name for the merge. Bug: 303404 Change-Id: I7fe09029996d0cfc09a7d8f097b5d6af1488fa93 Signed-off-by: Mathias Kinzler Signed-off-by: Chris Aniszczyk --- org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 45e77b1c17..e63f4e9d08 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -54,6 +54,9 @@ public class ConfigConstants { /** The "branch" section */ public static final String CONFIG_BRANCH_SECTION = "branch"; + /** The "remote" section */ + public static final String CONFIG_REMOTE_SECTION = "remote"; + /** The "autocrlf" key */ public static final String CONFIG_KEY_AUTOCRLF = "autocrlf"; @@ -81,4 +84,7 @@ public class ConfigConstants { /** The "rebase" key */ public static final String CONFIG_KEY_REBASE = "rebase"; + /** The "url" key */ + public static final String CONFIG_KEY_URL = "url"; + } -- cgit v1.2.3