aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
Commit message (Expand)AuthorAgeFilesLines
* Implement ours/theirs content conflict resolutionThomas Wolf2021-04-191-6/+28
* Merge branch 'stable-5.6'Matthias Sohn2020-02-221-1/+1
|\
| * Reorder modifiers to follow Java Language SpecificationDavid Pursehouse2020-02-191-1/+1
* | 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
* Make pull --rebase on an unborn branch do a checkoutThomas Wolf2019-06-101-0/+45
* Fix javadoc in org.eclipse.jgit annotations and api packagesMatthias Sohn2017-12-181-22/+32
* Allow to programmatically set FastForwardMode for PullCommandMatthias Sohn2017-06-161-5/+29
* Add support for config "pull.ffMattias Neuling2017-06-161-0/+11
* Fetch/PullCommand: Improve Javadoc of setRecurseSubmodulesDavid Pursehouse2017-06-161-1/+3
* Support pull on detached HEADMickael Istria2017-05-081-23/+24
* PullCommand: Add support for recursing into submodulesDavid Pursehouse2017-03-241-1/+18
* Enable and fix 'Should be tagged with @Override' warningDavid Pursehouse2017-02-191-0/+1
* Fix typo in @sinceThomas Wolf2017-02-191-1/+1
* PullCommand: Allow to set tag behaviorDavid Pursehouse2017-02-181-3/+18
* Handle all values of branch.[name].rebaseThomas Wolf2016-09-151-37/+67
* Add progress monitor to MergerLaurent Delaigue2016-01-211-0/+2
* Handle null in ProgressMonitor settersJonathan Nieder2015-06-111-0/+3
* Improve exception thrown when pull can't find advertised refMatthias Sohn2015-05-291-5/+9
* Externalize translatable texts in org.eclipse.jgitMatthias Sohn2015-05-261-4/+4
* Preserve merges during pull if configured to do soKonrad Kügler2014-07-151-23/+42
* Allow callers to use different merging strategiesLaurent Goubet2014-05-061-2/+17
* Cleanup javadocs so they pass the java8 doclint checksRobin Rosenberg2014-03-291-10/+12
* Allow programmatic remote configuration for PullCommandMatthias Sohn2014-02-141-16/+68
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-271-2/+2
* Add support for pull with --rebase and --no-rebaseMikael Karlsson2012-11-161-4/+48
* Improve ours/theirs conflict markers for rebase, cherry-pickRobin Stocker2012-08-181-4/+6
* Further cleanup of exceptions in Git APIRobin Rosenberg2012-06-051-40/+21
* Git API does not declare GitAPIException call() and related cleanupsRobin Rosenberg2012-05-301-1/+1
* Move JGitText to an internal packageRobin Rosenberg2012-03-121-1/+1
* Guard against null branch in PullCommandKevin Sawicki2011-11-221-1/+5
* Support a configured credentials provider in LsRemoteCommandKevin Sawicki2011-11-101-47/+2
* Enable full Transport configuration for JGit API commandsRoberto Tyley2011-09-161-0/+18
* Don't hard-code section names, use ConfigConstants insteadTomasz Zarna2011-08-021-1/+2
* PullCommand: Use short ref name in merge messageRobin Stocker2011-03-221-3/+4
* Fix NullPointer when pulling from a deleted local branchStefan Lay2011-02-161-1/+4
* PullCommand: use default remote instead of throwing ExceptionMathias Kinzler2011-02-081-7/+4
* Proper handling of rebase during pullMathias Kinzler2011-01-311-39/+32
* Add setCredentialsProvider to PullCommandTomasz Zarna2011-01-281-0/+17
* Make PullCommand work with RebaseMathias Kinzler2011-01-281-50/+73
* Reduce calls to Repository.getConfigShawn O. Pearce2010-12-151-1/+1
* Remove unnecessary null checkRobin Stocker2010-10-291-2/+1
* PullCommand: support upstream configuration for local branchesMathias Kinzler2010-10-281-33/+47
* Add "Pull" commandMathias Kinzler2010-10-081-0/+260
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 19:59:17 +0000