]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eac2dc1) | patch
Added Merge command to the CLI 20/320/7
authorChristian Halstrick <christian.halstrick@sap.com>
Fri, 5 Mar 2010 08:31:33 +0000 (09:31 +0100)
committerChris Aniszczyk <caniszczyk@gmail.com>
Tue, 29 Mar 2011 17:27:45 +0000 (12:27 -0500)
commit153283f05adc7cd3da44d49d576ec2562ac76608
treed560ba28e6e8d2bdf9722f9009a303d250735f62tree | snapshot
parenteac2dc18f11e517d995cf2db68d5675390daa02bcommit | diff
Added Merge command to the CLI

This merge command accepts the merge strategy as option and uses the
resolve strategy as default. It expects exactly one other
revision which is merged with current head.

Change-Id: Ia8c188b93ade4afabe6a9ccf267faf045f359a3a
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
org.eclipse.jgit.pgm/META-INF/MANIFEST.MF diff | blob | history
org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin 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 [new file with mode: 0644] blob
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit