Expose some constants needed for reading the Pull configuration

Change-Id: I72cb1cc718800c09366306ab2eebd43cd82023ff
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

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 3c396d6ae83bba716a2b200e28bf634f9d901c52..ccadf6bfe0f1852216f58e1e954f7a3ff08e4c14 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
@@ -99,9 +99,29 @@ public class ConfigConstants {
        /** The "autosetupmerge" key */
        public static final String CONFIG_KEY_AUTOSETUPMERGE = "autosetupmerge";
 
+       /** The "autosetuprebase" key */
+       public static final String CONFIG_KEY_AUTOSETUPREBASE = "autosetuprebase";
        /** The "name" key */
        public static final String CONFIG_KEY_NAME = "name";
 
        /** The "email" key */
        public static final String CONFIG_KEY_EMAIL = "email";
+
+       /** The "false" key (used to configure {@link #CONFIG_KEY_AUTOSETUPMERGE} */
+       public static final String CONFIG_KEY_FALSE = "false";
+
+       /** The "true" key (used to configure {@link #CONFIG_KEY_AUTOSETUPMERGE} */
+       public static final String CONFIG_KEY_TRUE = "true";
+
+       /**
+        * The "always" key (used to configure {@link #CONFIG_KEY_AUTOSETUPREBASE}
+        * and {@link #CONFIG_KEY_AUTOSETUPMERGE}
+        */
+       public static final String CONFIG_KEY_ALWAYS = "always";
+
+       /** The "never" key (used to configure {@link #CONFIG_KEY_AUTOSETUPREBASE} */
+       public static final String CONFIG_KEY_NEVER = "never";
+
+       /** The "local" key (used to configure {@link #CONFIG_KEY_AUTOSETUPREBASE} */
+       public static final String CONFIG_KEY_LOCAL = "local";
 }