]> source.dussan.org Git - jgit.git/commit
Add --squash option to org.eclipse.jgit.pgm.Merge 56/7956/2
authorTomasz Zarna <tzarna@gmail.com>
Sun, 7 Oct 2012 21:38:34 +0000 (23:38 +0200)
committerTomasz Zarna <tzarna@gmail.com>
Sun, 7 Oct 2012 21:38:34 +0000 (23:38 +0200)
commite8c25a1738cb8c34116aced00152cd99ac5b44ef
treee07c4fdfd8755509094bad43aae3d45516d106fd
parenta27c1a6b15c8237739285544ab1e4c56543b2985
Add --squash option to org.eclipse.jgit.pgm.Merge

Change-Id: Ifd20b6f4731cfa71319145cac7b464aa53db18b8
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeTest.java
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java