]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3f0176a) | patch
Add additional FastForwardMode enums for different config contexts 43/9743/2
authorTomasz Zarna <tzarna@gmail.com>
Thu, 17 Jan 2013 20:38:43 +0000 (21:38 +0100)
committerTomasz Zarna <tzarna@gmail.com>
Fri, 18 Jan 2013 11:04:17 +0000 (12:04 +0100)
commit6a8da4c134dff042712e4bae8817d79cc63866f4
treeafa0aee4370d3b94ba3a8ca9c2ae89a7b8f552d8tree | snapshot
parent3f0176aea6e77cb39be35f091100f8874693593dcommit | diff
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
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit