]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c2d1183) | patch
Add additional FastForwardMode enums for different config contexts 91/8991/5
authorTomasz Zarna <tzarna@gmail.com>
Fri, 7 Dec 2012 21:45:01 +0000 (22:45 +0100)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Mon, 7 Jan 2013 00:12:10 +0000 (19:12 -0500)
commitc98abc9c0586c73ef7df4172644b7dd21c979e9d
tree9a99c1f204cd96dab78f1b427de6f4f30ecbe183tree | snapshot
parentc2d1183e39174336605509642b6f60157b9e2c3acommit | diff
Add additional FastForwardMode enums for different config contexts

FastForwardMode should be represented by different enums 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: I3ecc16d48e715b81320b73ffae4caf3558f965f2
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