]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cb0f0ad) | patch
Add support for --no-ff while merging 95/8395/6
authorTomasz Zarna <tomasz.zarna@tasktop.com>
Mon, 29 Oct 2012 15:21:59 +0000 (16:21 +0100)
committerTomasz Zarna <tomasz.zarna@tasktop.com>
Fri, 16 Nov 2012 10:04:13 +0000 (11:04 +0100)
commit318f3d464307e3efd8342852310c17e71a7282fe
treebcd251a7110555cd46c5ab18e5e673f52c214cd2tree | snapshot
parentcb0f0ad4cfe2733ff09c2ce4d3b72265ccfee281commit | diff
Add support for --no-ff while merging

Bug: 394432
Change-Id: I373128c0ba949f9b24248874f77f3d68b50ccfd1
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java diff | blob | history
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java diff | blob | history
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit