summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMathias Kinzler2011-02-02 08:45:37 (EST)
committer Mathias Kinzler2011-02-02 08:45:37 (EST)
commit13a406287e816f10a4062312da810ec7d43e6841 (patch)
tree4e267b5ae01c9067b3e73b8b907aec80ea83bcf1
parentb0245b548b9c9fe1801fb8af727b08a7c3cc9706 (diff)
downloadjgit-13a406287e816f10a4062312da810ec7d43e6841.zip
jgit-13a406287e816f10a4062312da810ec7d43e6841.tar.gz
jgit-13a406287e816f10a4062312da810ec7d43e6841.tar.bz2
Expose some constants needed for reading the Pull configurationrefs/changes/02/2402/1
Change-Id: I72cb1cc718800c09366306ab2eebd43cd82023ff Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java20
1 files changed, 20 insertions, 0 deletions
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 3c396d6..ccadf6b 100644
--- 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";
}