aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java
Commit message (Expand)AuthorAgeFilesLines
* Merge: Avoid non-localised literal string warning for "recursive"David Pursehouse2019-01-211-8/+5
* pgm: Fix missing braces in Merge commandMatthias Sohn2019-01-211-10/+18
* pgm: Handle exceptions in Merge commandMatthias Sohn2019-01-211-90/+100
* Fix javadoc in org.eclipse.jgit.pgmMatthias Sohn2017-12-181-0/+1
* Organize importsDavid Pursehouse2016-11-141-1/+1
* Replace use of deprecated method Repository.getRef()Matthias Sohn2016-05-311-2/+2
* Null-annotated Ref class and fixed related compiler errorsAndrey Loskutov2015-12-151-3/+6
* Null-annotated Repository class and fixed related compiler errorsAndrey Loskutov2015-11-251-1/+9
* pgm: Open RevWalk and TreeWalk in try-with-resourceDavid Pursehouse2015-10-011-7/+8
* pgm: Create instances of Git in try-with-resourceDavid Pursehouse2015-10-011-14/+15
* Handle -m option for Merge commandAxel Richard2014-08-301-1/+8
* Add missing usage texts for JGit commandline commandsMatthias Sohn2013-09-091-4/+8
* Move org.eclipse.jgit.pgm's resource bundle to internal packageMatthias Sohn2013-05-061-0/+1
* Make recursive merge strategy the default merge strategyMatthias Sohn2013-04-151-1/+1
* clean up merge squash and no-commit messages in pgmTomasz Zarna2013-04-081-0/+1
* Detect and handle a checkout conflict during merge nicelyRobin Rosenberg2013-04-081-1/+13
* Add the no-commit option to MergeCommandTomasz Zarna2013-04-041-1/+8
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-4/+4
* Add a case statement for fast-forward mergeRobin Rosenberg2012-11-251-0/+1
* Add support for --no-ff while mergingTomasz Zarna2012-11-161-4/+55
* Add --squash option to org.eclipse.jgit.pgm.MergeTomasz Zarna2012-10-071-1/+9
* Remove uses of TextBuiltin.out in favor of outwRobin Rosenberg2012-09-231-1/+1
* Add tests for output result of merging -- org.eclipse.jgit.pgm.MergeTomasz Zarna2012-09-171-0/+2
* Check for write errors in standard out and exit with errorRobin Rosenberg2012-09-161-9/+9
* Typo in CLIText#unknownMergeStratey, should be #unknownMergeStrategyTomasz Zarna2012-07-141-1/+1
* Merge in JGit CLI is missing break statementTomasz Zarna2011-07-121-0/+1
* Added Merge command to the CLIChristian Halstrick2011-03-291-0/+122