]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2b72281) | patch
Use branch.<x>.mergeoptions and merge.ff as defaults for merging 85/20785/5
authorKonrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Sat, 18 Jan 2014 12:00:08 +0000 (13:00 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 13 Feb 2014 23:34:01 +0000 (00:34 +0100)
commit48e36d8cb335382b99ec829d0dfe34be71ed49bb
tree5f5a90e82b460c6d10d30330354fde59ca04229ctree | snapshot
parent2b722815c9b6e3f8e50a081404265fb5b56b60e8commit | diff
Use branch.<x>.mergeoptions and merge.ff as defaults for merging

Read options that control squashing, whether or not to commit the merge
and regarding fast forwarding from the configuration and use them if no
explicit values for these options have been provided to MergeCommand.

Change-Id: Ifdaed4b5e4adc142657c03c8e78b709a99eeddbd
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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/merge/MergeConfig.java [new file with mode: 0644] blob
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit