aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
Commit message (Expand)AuthorAgeFilesLines
* Enable and fix warnings about redundant specification of type argumentsDavid Pursehouse2017-02-201-2/+2
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-191-0/+1
* Add toString() to CherryPickCommand and ResetCommandMatthias Sohn2016-10-091-0/+11
* Replace use of deprecated method Repository.getRef()Matthias Sohn2016-05-311-1/+1
* Silence non-externalized string warning in CherryPickCommandMatthias Sohn2015-04-031-1/+1
* Use try-with-resource to close resources in CherryPickCommandMatthias Sohn2015-04-031-4/+1
* Support for the pre-commit hookLaurent Goubet2015-02-021-1/+2
* Cherry-Pick: Support --no-commitKonrad Kügler2014-07-141-6/+27
* Cherry-Pick: Support --mainline to pick mergesKonrad Kügler2014-05-171-9/+41
* Allow callers to use different merging strategiesLaurent Goubet2014-05-061-2/+14
* Add missing @since tagsLars Vogel2013-08-101-0/+1
* Update reflog like C Git during rebase (non-interactive)Robin Rosenberg2013-07-211-3/+19
* Update HEAD in cherry-picking several commitsHiroshi Tomita2013-07-011-5/+4
* Make recursive merge strategy the default merge strategyMatthias Sohn2013-04-151-1/+1
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-2/+2
* Improve ours/theirs conflict markers for rebase, cherry-pickRobin Stocker2012-08-181-0/+28
* Further cleanup of exceptions in Git APIRobin Rosenberg2012-06-051-1/+13
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Add commit id and parent count to exception messageKevin Sawicki2011-12-271-3/+6
* Fix the reflog prefix for cherry-pick, revert and merge commandsRobin Rosenberg2011-09-211-1/+3
* Add CHERRY_PICK_HEAD for cherry-pick conflictsRobin Stocker2011-04-061-1/+10
* Do not categorize merge failures as 'abnormal'Philipp Thun2011-03-281-1/+1
* Introduce CherryPickResultPhilipp Thun2011-03-231-21/+11
* Do not cherry-pick or revert commit more than onceRobin Rosenberg2011-01-101-0/+5
* Add Cherry-Pick commandChristian Halstrick2010-10-151-0/+205