diff options
| author | Tomasz Zarna <tzarna@gmail.com> | 2013-01-17 21:38:43 +0100 |
|---|---|---|
| committer | Tomasz Zarna <tzarna@gmail.com> | 2013-01-18 12:04:17 +0100 |
| commit | 6a8da4c134dff042712e4bae8817d79cc63866f4 (patch) | |
| tree | afa0aee4370d3b94ba3a8ca9c2ae89a7b8f552d8 /org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | |
| parent | 3f0176aea6e77cb39be35f091100f8874693593d (diff) | |
| download | jgit-6a8da4c134dff042712e4bae8817d79cc63866f4.tar.gz jgit-6a8da4c134dff042712e4bae8817d79cc63866f4.zip | |
Add additional FastForwardMode enums for different config contexts
FastForwardMode is represented by different strings depending on context
it is set or get from. E.g. FastForwardMode.FF_ONLY for
branch.<name>.mergeoptions is "--ff-only" but for merge.ff it is "only".
Change-Id: I39ae93578e4783de80ebf4af29ae23b3936eec47
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 3 |
1 files changed, 3 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 dbaa043e21..8fd84c8938 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -191,4 +191,7 @@ public class ConfigConstants { /** The "mergeoptions" key */ public static final String CONFIG_KEY_MERGEOPTIONS = "mergeoptions"; + + /** The "ff" key */ + public static final String CONFIG_KEY_FF = "ff"; } |