aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/api
Commit message (Expand)AuthorAgeFilesLines
* Fix corrupted CloneCommand bare-repo fetch-refspec (#402031)Roberto Tyley2013-03-041-4/+5
* Really handle annotated tags in MergeCommandRobin Rosenberg2013-02-081-0/+1
* Fix stash apply using merge logicRobin Rosenberg2013-01-302-226/+126
* Fix Check for FF_ONLY merges againRobin Rosenberg2013-01-291-1/+1
* Check for FF_ONLY merges correctlyRobin Rosenberg2013-01-291-2/+2
* Merge "Improve handling of checkout conflicts"Robin Rosenberg2013-01-203-2/+80
|\
| * Improve handling of checkout conflictsMarkus Duft2013-01-113-2/+80
* | Merge "Fix patch application WRT windows line endings."Robin Rosenberg2013-01-191-7/+4
|\ \
| * | Fix patch application WRT windows line endings.Markus Duft2013-01-191-7/+4
| |/
* / 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
* Merge changes I3e9735c7,I76a16594Robin Rosenberg2013-01-081-12/+11
|\
| * Speed up handling of "only" paths in the CommitCommandRobin Rosenberg2013-01-071-12/+11
* | Add additional FastForwardMode enums for different config contextsTomasz Zarna2013-01-061-0/+116
|/
* Update the revert command and things relating to revertRobin Rosenberg2012-12-283-7/+65
* Do not perform character translation on copies in patchesRobin Rosenberg2012-12-271-3/+8
* Mark non-externalizable strings as suchRobin Rosenberg2012-12-2723-104/+111
* [findBugs] Don't pass null for non-null parameter in RebaseCommandMatthias Sohn2012-12-051-1/+5
* Merge "Commit message may not necessarily be in UTF-8"Shawn Pearce2012-12-041-2/+2
|\
| * Commit message may not necessarily be in UTF-8Robin Rosenberg2012-11-271-2/+2
* | Support --cached in RmCommandRobin Stocker2012-12-031-12/+49
|/
* Add support for rebase interactive 'edit' commandDariusz Luksza2012-11-191-7/+20
* Add support for rebase interactive 'reword' commandDariusz Luksza2012-11-191-7/+129
* Add GarbageCollectCommand to porcelain APIMatthias Sohn2012-11-182-0/+159
* Add support for pull with --rebase and --no-rebaseMikael Karlsson2012-11-161-4/+48
* Adapt Status and CleanCommand to support cleaning directoriesMarkus Duft2012-11-162-2/+108
* CheckoutCommand: Support checking out ours and theirsRobin Stocker2012-11-161-42/+134
* Add support for --no-ff while mergingTomasz Zarna2012-11-162-10/+80
* Add a test for org.eclipse.jgit.pgm.TagTomasz Zarna2012-11-151-0/+6
* CommitCommand: Ensure unmerged paths are added correctly with setOnlyRobin Stocker2012-11-121-23/+28
* ResetCommand: Use DirCacheBuilder in resetIndexRobin Stocker2012-11-011-13/+4
* ResetCommand: Correctly reset unmerged paths in resetIndexForPathsRobin Stocker2012-11-011-25/+12
* Add Javadoc description for packagesRobin Stocker2012-10-312-0/+8
* Merge "Extend Javadoc of CheckoutCommand and add examples"Shawn Pearce2012-10-251-10/+96
|\
| * Extend Javadoc of CheckoutCommand and add examplesRobin Stocker2012-10-181-10/+96
* | Merge "Don't allow null name or e-mail in PersonIdent"Shawn Pearce2012-10-251-6/+4
|\ \
| * | Don't allow null name or e-mail in PersonIdentRobin Stocker2012-10-131-6/+4
* | | Merge "Simplify push error message when ref already exists"Shawn O. Pearce2012-10-252-2/+2
|\ \ \
| * | | Simplify push error message when ref already existsShawn O. Pearce2012-10-172-2/+2
| | |/ | |/|
* / | StashCreateCommand: Abort in case of unmerged pathsRobin Stocker2012-10-221-0/+6
|/ /
* | Merge "Add a hint on the purpose of JGitInternalException to the constructor"Christian Halstrick2012-10-141-0/+4
|\ \ | |/ |/|
| * Add a hint on the purpose of JGitInternalException to the constructorRobin Rosenberg2012-10-141-0/+4
* | CommitCommand: Use original author on amend if author is not setRobin Stocker2012-10-081-3/+7
* | CommitCommand: Don't allow amending on initial commitRobin Stocker2012-10-081-0/+4
|/
* Refuse to checkout unmerged paths from indexRobin Stocker2012-09-231-1/+8
* Output result of switching branch -- o.e.jgit.pgm.CheckoutTomasz Zarna2012-09-051-1/+1
* Enable rebase to continue for all rebase stagesRobin Rosenberg2012-08-271-0/+3
* Improve ours/theirs conflict markers for rebase, cherry-pickRobin Stocker2012-08-183-7/+79
* Merge "Allow JGit to read C Git rebase state"Christian Halstrick2012-08-131-1/+8
|\
| * Allow JGit to read C Git rebase stateRobin Rosenberg2012-08-071-1/+8