aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
Commit message (Expand)AuthorAgeFilesLines
* Use git config core.commentCharThomas Wolf2022-03-261-1/+5
* Merge conflict messages: prefix conflict lines with a hashThomas Wolf2022-01-311-1/+1
* Add git config for conflict style merge/diff3Thomas Wolf2021-05-031-0/+14
* Implement ours/theirs content conflict resolutionThomas Wolf2021-04-191-2/+22
* Update EDL 1.0 license headers to new short SPDX compliant formatMatthias Sohn2020-01-041-38/+5
* Enable and fix "Statement unnecessarily nested within else clause" warningsDavid Pursehouse2019-10-171-20/+17
* Fix typos in JavadocMichael Keppler2019-07-081-2/+2
* Repository: Deprecate #peel methodDavid Pursehouse2018-05-221-1/+1
* Handle Gerrit Change-Ids for merge commitsThomas Wolf2018-04-181-0/+20
* MergeCommand: Open RevWalk in try-with-resourceDavid Pursehouse2018-03-071-6/+1
* Progress reporting for checkoutMarkus Duft2018-01-231-0/+3
* Fix javadoc in org.eclipse.jgit annotations and api packagesMatthias Sohn2017-12-181-12/+24
* Send a detailed event on working tree modificationsThomas Wolf2017-08-151-0/+5
* Improve javadoc for MergeCommand.setFastForward()Matthias Sohn2017-06-151-3/+7
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-1/+1
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-191-0/+3
* Don't rely on default locale when using toUpperCase() and toLowerCase()Matthias Sohn2017-01-281-1/+2
* Implement auto gcMatthias Sohn2016-10-231-0/+1
* Replace use of deprecated method Repository.getRef()Matthias Sohn2016-05-311-1/+1
* Add progress monitor to MergerLaurent Delaigue2016-01-211-0/+25
* Use AutoClosable to close resources in bundle org.eclipse.jgitMatthias Sohn2015-05-211-4/+6
* Rename local variables/parameters to remove warnings about hidingRobin Rosenberg2014-09-041-9/+9
* Handle -m option for Merge commandAxel Richard2014-08-301-2/+21
* Cleanup javadocs so they pass the java8 doclint checksRobin Rosenberg2014-03-291-3/+3
* Use branch.<x>.mergeoptions and merge.ff as defaults for mergingKonrad Kügler2014-02-141-6/+23
* Fix exception on conflicts with recursive mergeRobin Stocker2013-12-031-4/+2
* Make recursive merge strategy the default merge strategyMatthias Sohn2013-04-151-1/+1
* Add the no-commit option to MergeCommandTomasz Zarna2013-04-041-8/+37
* Really handle annotated tags in MergeCommandRobin Rosenberg2013-02-081-0/+1
* Fix Check for FF_ONLY merges againRobin Rosenberg2013-01-291-1/+1
* Check for FF_ONLY merges correctlyRobin Rosenberg2013-01-291-2/+2
* Add additional FastForwardMode enums for different config contextsTomasz Zarna2013-01-181-3/+75
* Revert "Add additional FastForwardMode enums for different config contexts"Shawn Pearce2013-01-111-116/+0
* Add additional FastForwardMode enums for different config contextsTomasz Zarna2013-01-061-0/+116
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-7/+7
* Add support for --no-ff while mergingTomasz Zarna2012-11-161-10/+66
* Add "--squash" option to MergeCommandTomasz Zarna2012-06-151-16/+74
* Git API does not declare GitAPIException call() and related cleanupsRobin Rosenberg2012-05-301-1/+2
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Throw API exception when MergeCommand hits checkout conflicts Matthias Sohn2011-12-081-3/+9
* Append merge strategy to reflog messageRobin Rosenberg2011-09-211-1/+3
* Fix the reflog prefix for cherry-pick, revert and merge commandsRobin Rosenberg2011-09-211-1/+3
* Fix ClassCastException in MergeCommandDenys Digtiar2011-08-211-3/+2
* Add "Conflicts" section to merge message on conflictRobin Stocker2011-04-061-3/+11
* Improve MergeResultPhilipp Thun2011-03-211-1/+1
* MergeCommand should create missing branchesChristian Halstrick2011-01-261-2/+25
* Fix misc spelling errors in comments and method namesRobin Rosenberg2011-01-171-1/+1
* Format merge commit messages like C GitRobin Stocker2010-11-061-3/+5
* Rename method to ResolveMerger.setWorkingTreeIterator()Christian Halstrick2010-10-131-1/+1
* Remove wrong comment in MergeCommandChristian Halstrick2010-10-121-3/+0
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 05:09:55 +0000