aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java
Commit message (Expand)AuthorAgeFilesLines
* Remove deprecated MergeMessageFormatter#formatWithConflictsMatthias Sohn2024-09-031-18/+0
* Merge conflict messages: prefix conflict lines with a hashThomas Wolf2022-01-311-10/+36
* 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-4/+5
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-6/+6
* Null-annotated Ref class and fixed related compiler errorsAndrey Loskutov2015-12-151-11/+12
* Silence non-externalized string warnings in org.eclipse.jgitMatthias Sohn2015-05-261-7/+7
* Add conflicts message before footerStefan Lay2013-01-191-6/+19
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-14/+14
* Add "--squash" option to MergeCommandTomasz Zarna2012-06-151-2/+2
* Adapt merge message to C Git for remote-tracking branchRobin Stocker2011-11-231-2/+2
* Fix "into" part of merge message for HEADRobin Stocker2011-05-051-2/+1
* Add CHERRY_PICK_HEAD for cherry-pick conflictsRobin Stocker2011-04-061-0/+21
* Don't print "into HEAD" when merging refs/heads/masterRobin Stocker2011-02-011-1/+2
* Format merge commit messages like C GitRobin Stocker2010-11-061-0/+132