]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: caefdf5) | patch
Improve javadoc for MergeCommand.setFastForward() 31/99431/1
authorMatthias Sohn <matthias.sohn@sap.com>
Thu, 15 Jun 2017 20:58:29 +0000 (22:58 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 15 Jun 2017 21:11:46 +0000 (23:11 +0200)
commita45b045c7378c3685d7b0a39173b69c87efe7371
treec69444a3c68b29b4dbd107fa9126859ce7f324e6tree | snapshot
parentcaefdf54eeb43f934d93884938c0e64ab36511e0commit | diff
Improve javadoc for MergeCommand.setFastForward()

- mark parameter to be nullable
- explain that we fallback to value of merge.ff if set to null and to
--ff if also not configured there

Change-Id: Id077763b95195d21543ac637f9939a6d4179e982
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit