41 Commits (064834d350d38f672a69947cf924f56d52bd1274)

Author SHA1 Message Date
  David Pursehouse 064834d350 Reorder modifiers to follow Java Language Specification 4 years ago
  David Pursehouse 98cdca9b5a Enable and fix "Statement unnecessarily nested within else clause" warnings 4 years ago
  Thomas Wolf 8a2e221096 Make pull --rebase on an unborn branch do a checkout 5 years ago
  Matthias Sohn 0210e0e299 Fix javadoc in org.eclipse.jgit annotations and api packages 6 years ago
  Matthias Sohn df638e0cfc Allow to programmatically set FastForwardMode for PullCommand 7 years ago
  Mattias Neuling 0d447b1660 Add support for config "pull.ff 8 years ago
  David Pursehouse b4a46b5ed0 Fetch/PullCommand: Improve Javadoc of setRecurseSubmodules 7 years ago
  Mickael Istria 5b84e25fa3 Support pull on detached HEAD 7 years ago
  David Pursehouse 5f902f07cc PullCommand: Add support for recursing into submodules 7 years ago
  David Pursehouse 7ac182f4e4 Enable and fix 'Should be tagged with @Override' warning 7 years ago
  Thomas Wolf 0a4cf573d3 Fix typo in @since 7 years ago
  David Pursehouse 1cda4faed4 PullCommand: Allow to set tag behavior 7 years ago
  Thomas Wolf aadbb158e1 Handle all values of branch.[name].rebase 7 years ago
  Laurent Delaigue 4409751516 Add progress monitor to Merger 8 years ago
  Laurent Delaigue 1e1fb9fc59 Add progress monitor to Merger 8 years ago
  Jonathan Nieder bbfd9b0e5f Handle null in ProgressMonitor setters 9 years ago
  Matthias Sohn efacad0fc8 Improve exception thrown when pull can't find advertised ref 9 years ago
  Matthias Sohn 2390531888 Externalize translatable texts in org.eclipse.jgit 9 years ago
  Konrad Kügler 48544e27ae Preserve merges during pull if configured to do so 10 years ago
  Laurent Goubet 7424d58255 Allow callers to use different merging strategies 10 years ago
  Robin Rosenberg 32ff57a2b2 Cleanup javadocs so they pass the java8 doclint checks 10 years ago
  Matthias Sohn 1eae309723 Allow programmatic remote configuration for PullCommand 10 years ago
  Robin Rosenberg c310fa0c80 Mark non-externalizable strings as such 11 years ago
  Mikael Karlsson fa5231191d Add support for pull with --rebase and --no-rebase 12 years ago
  Robin Stocker 5854ca091a Improve ours/theirs conflict markers for rebase, cherry-pick 11 years ago
  Robin Rosenberg b61d35e848 Further cleanup of exceptions in Git API 12 years ago
  Robin Rosenberg 4e1454ded6 Git API does not declare GitAPIException call() and related cleanups 12 years ago
  Robin Rosenberg 95d311f888 Move JGitText to an internal package 12 years ago
  Kevin Sawicki c3fe50bb18 Guard against null branch in PullCommand 12 years ago
  Kevin Sawicki da901c4968 Support a configured credentials provider in LsRemoteCommand 12 years ago
  Roberto Tyley 791a9fd691 Enable full Transport configuration for JGit API commands 12 years ago
  Tomasz Zarna 6d293c7b06 Don't hard-code section names, use ConfigConstants instead 13 years ago
  Robin Stocker 770c733687 PullCommand: Use short ref name in merge message 13 years ago
  Stefan Lay 68064ed339 Fix NullPointer when pulling from a deleted local branch 13 years ago
  Stefan Lay 68459b646e Fix NullPointer when pulling from a deleted local branch 13 years ago
  Mathias Kinzler 724af77c65 PullCommand: use default remote instead of throwing Exception 13 years ago
  Mathias Kinzler b15b9d5df2 Proper handling of rebase during pull 13 years ago
  Tomasz Zarna 9fbda22392 Add setCredentialsProvider to PullCommand 13 years ago
  Mathias Kinzler 14ca80bc90 Make PullCommand work with Rebase 13 years ago
  Shawn O. Pearce 013cb8de38 Reduce calls to Repository.getConfig 13 years ago
  Robin Stocker d36c80fd04 Remove unnecessary null check 13 years ago
  Mathias Kinzler 7668a46282 PullCommand: support upstream configuration for local branches 13 years ago
  Mathias Kinzler db55d13f5f Add "Pull" command 13 years ago