Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-12-26Merge branch 'stable-1.2'Matthias Sohn2-0/+100
* stable-1.2: JGit v1.2.0.201112221803-r Expose unmerged paths when revert fails Enforce the use of Java5 API:s only (with a few exceptions) Change-Id: Ib18d41a65e68cc47fb63114fcce27a16820d0692 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-22JGit v1.2.0.201112221803-rv1.2.0.201112221803-rstable-1.2Matthias Sohn2-2/+2
Change-Id: Icc0b09324f205d93929af8cf522a99ad00cf7591 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-18Allow to amend commits with JGit CLITomasz Zarna2-0/+5
Change-Id: I0e8d365b56e079ac4ccece7fcf80ea140c319c78
2011-12-16Enforce the use of Java5 API:s only (with a few exceptions)Robin Rosenberg2-0/+100
This only works with Eclipse 3.6 and newer and requires installation of new package. Documentation is not very good, but there is a blog about it here: http://eclipseandjazz.blogspot.com/2011/10/of-invalid-references-to-system.html API checking is especially useful on OS X where Java5 is not readily available. Change-Id: I3c0ad460874a21c073f5ac047146cbf5d31992b4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-10Prepare 1.3.0 buildsMatthias Sohn2-25/+25
Change-Id: I7a1ae73783c95041b59f047a7330e62e7f642149 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-12-06Force jgit.sh to use UTF-8 encoding on MacRobin Rosenberg1-0/+1
For some obscure reason the platform encodng in Java on Macs is MacRoman. OS X used UTF-8 as the default encoding so set the encoding property in jgit.sh. Change-Id: I08182c2f8512f799178cee70bcc28d6ee2b9c2b0
2011-10-26Make use of the many date formatting options in the log commandRobin Rosenberg2-12/+15
Change-Id: I30f1049fce086f2cf7e39ba3ad8b335df3a7b827
2011-10-20Add a method to SystemReader to get the time zoneRobin Rosenberg1-1/+2
Change-Id: Ifd31f408ed2c5b7869694b715fea3219e74963ef
2011-09-22Merge "Document the show methods of RevWalkTextBuiltin"Robin Rosenberg1-0/+22
2011-09-22Merge "Fix a boxing warning in org.eclipse.jgit.pgm.RevWalkTextBuiltin"Robin Rosenberg1-2/+4
2011-09-18Document the show methods of RevWalkTextBuiltinRobin Rosenberg1-0/+22
Change-Id: Ic704008cb215e1437c0a3fd1aec3aa38209ef3c7 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2011-09-18Fix a boxing warning in org.eclipse.jgit.pgm.RevWalkTextBuiltinRobin Rosenberg1-2/+4
Change-Id: Ia154da79926ce25731e856bed264dd19a76bc1f1 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2011-09-15Prepare 1.2.0 buildsMatthias Sohn2-25/+25
Change-Id: I9ec247135d93ef28d732e94f18d0ec1d0e2e6d44 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-09-15Prepare post v1.1.0.201109151100-r buildstable-1.1Matthias Sohn2-2/+2
Change-Id: Ib099ec93d8243b238641d79328216874532ab5eb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-09-15JGit v1.1.0.201109151100-rv1.1.0.201109151100-rMatthias Sohn2-2/+2
Change-Id: Iadcec7e5973600e005cbdeb837fa197d3ae2ea86 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-09-07Prepare post v1.1.0.201109071825-rc3 buildsMatthias Sohn2-2/+2
Change-Id: I1244f6639263d156a6f9e4530167e5eb1826a535 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-09-07JGit v1.1.0.201109071825-rc3v1.1.0.201109071825-rc3Matthias Sohn2-2/+2
Change-Id: I1b989d3101272632eacabe25a0b111ad0ff5bb3b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-09-05Use commit message best practices for Mylyn Commit templateMatthias Sohn2-0/+7
We should use a template for Mylyn commit messages that matches with our guidelines for commit messages. http://wiki.eclipse.org/EGit/Contributor_Guide#Commit_message_guidelines Bug: 337401 Change-Id: I05812abf0eb0651d22c439142640f173fc2f2ba0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-09-01Prepare post-v1.1.0.201109011030-rc2 buildsMatthias Sohn2-2/+2
Change-Id: I8dda83cdbe88beba4a480df9846848bf3aceb9e2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-09-01JGit v1.1.0.201109011030-rc2v1.1.0.201109011030-rc2Matthias Sohn2-2/+2
Change-Id: Ie6d65fe45ad92c813ce3a227729aa43681922249 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-08-27Use the appropriate constant for ".git"Robin Rosenberg2-2/+2
We have two constants with the same content. DOT_GIT is intended for the git repository below the work tree, while DOT_GIT_EXT is the ".git" directory extension usually associated with bare repositories. Change-Id: I0946b4beb2d1c3af289ddbbb5641d2f4e4c49d3f Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2011-08-13blame: Implement blame on the command lineShawn O. Pearce6-0/+371
Command line options match the C implementation of `git blame` as closely as possible, making for a pretty complete tool. Change-Id: Ie1bd172ad9de586c3b60f0ee4a77a8f047364882 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2011-08-08Fix jgit rev-list --objects masterShawn O. Pearce1-3/+5
This flag was not being honored due to a bug in createWalk(). argWalk is always non-null when there are commits passed in on the command line. If --objects was specified, always make a new ObjectWalk for the actual execution. Change-Id: I6e1a1636f2634605d86671a83766cc1c42939821 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2011-07-12Merge "Merge in JGit CLI is missing break statement"Chris Aniszczyk1-0/+1
2011-07-12Merge in JGit CLI is missing break statementTomasz Zarna1-0/+1
Change-Id: I2095601b848e66e54d5dac828ef6ed1a4c5ae66c Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-06-19RFC: Ugly fix for i18n of metaVar CLI argumentsRobin Rosenberg2-0/+67
This patch possibly ties to a specific version of args4j. Bug: 318286 Change-Id: I05d4ecf6bd25deec7fb2efbfa61913f4ec4e04e5 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2011-06-09Merge branch 'stable-1.0'Matthias Sohn3-1/+62
* stable-1.0: Prepare post JGit v1.0.0.201106090707-r builds JGit v1.0.0.201106090707-r Include about.html files in maven build Prepare post v1.0.0.201106081625-r builds JGit v1.0.0.201106081625-r Add missing about.html files to all shipped bundles Prepare post v1.0.0.201106071701-r builds JGit v1.0.0.201106071701-r
2011-06-09Prepare post JGit v1.0.0.201106090707-r buildsstable-1.0Matthias Sohn2-2/+2
Change-Id: I35292f9f6fb5ebc591308fdd2d069203413e189d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-09JGit v1.0.0.201106090707-rv1.0.0.201106090707-rMatthias Sohn2-2/+2
Change-Id: Iba44e71b6441a0e39122ca8666b51989e605f25f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-09Include about.html files in maven buildMatthias Sohn1-0/+1
Change-Id: Ifa96090eb0fc336ee8080385f48212b5158dd9f7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-09Prepare post v1.0.0.201106081625-r buildsMatthias Sohn2-2/+2
Change-Id: I5e6994844405f7839ad3b3439f98bcadb59d329b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-08JGit v1.0.0.201106081625-rv1.0.0.201106081625-rMatthias Sohn2-2/+2
Change-Id: I629990189083bab4737938ad712080fba7917582 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-08Add missing about.html files to all shipped bundlesMatthias Sohn2-1/+61
Change-Id: I5a4ad9493da3816f21d9fdd0b5b977388d074500 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-08Prepare post v1.0.0.201106071701-r buildsMatthias Sohn2-2/+2
Change-Id: I67ee2912ef54462cf860dc4ec0a6334e9c619384 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-07JGit v1.0.0.201106071701-rv1.0.0.201106071701-rMatthias Sohn2-2/+2
Change-Id: Ic8f49336ba96c8dcf4bab2f74c0f1efc1ab55131 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-05Prepare 1.1.0 buildsMatthias Sohn2-24/+24
Change-Id: I4cf017cd567543846839612ab3ace6d26233e01d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-05Prepare post v1.0.0.201106051725-r buildsMatthias Sohn2-2/+2
Change-Id: I4839877e1a6fa7782f37423213af8d579727a494 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-05JGit v1.0.0.201106051725-rv1.0.0.201106051725-rMatthias Sohn2-2/+2
Change-Id: I39f4a23cf284505395d511dfedf02b7f5608df95 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-01Prepare post v1.0.0.201106011211-rc3 buildsMatthias Sohn2-2/+2
Change-Id: I4dec8eba7e35858aef65fcc10f91fad3fe5b52b9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-06-01JGit v1.0.0.201106011211-rc3v1.0.0.201106011211-rc3Matthias Sohn2-2/+2
Change-Id: I574a05200471c431b3a02ac6ff208dc6aa90f539 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-05-31Remove incubation markerMatthias Sohn1-1/+1
Change-Id: I6018ce0cd3b7c8137e137848fe1f04551b257538 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-05-31jgit.sh: Implement pager supportShawn O. Pearce1-4/+33
If the command is either `diff` or `log`, there is often a lot of lines of output. Run these commands through $GIT_PAGER, $PAGER, or `less` in order to make it easier to browse the output on a terminal. Change-Id: I18b87ea4acf404b94788f2ac2101812bd13e6a0f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2011-05-02Qualify post-0.12 buildsMatthias Sohn2-24/+24
Change-Id: I70fe2671321efb5c3d271121ce00299533d1b388 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-05-02JGit 0.12.1v0.12.1stable-0.12Matthias Sohn2-24/+24
Change-Id: Ia6e58b466fa3ef7ddd61b40f2ad44141fe8786c4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2011-03-29Added Merge command to the CLIChristian Halstrick5-0/+142
This merge command accepts the merge strategy as option and uses the resolve strategy as default. It expects exactly one other revision which is merged with current head. Change-Id: Ia8c188b93ade4afabe6a9ccf267faf045f359a3a Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2011-03-24Registering the Checkout command and fixed a typo.Sasa Zivkov2-1/+2
The Checkout command line command was added to JGit but it wasn't registered in the list of available commands. Additionally, the 'force' option was named '---force' (triple '-'). Change-Id: I259773932fa9aec3bb29e215740e67c834566f6f Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>
2011-03-15PushCommand: Add utilities for --all, --tagsShawn O. Pearce1-6/+6
The --all flag on the command line implies using refs/heads/* as a push specification. Add this to the standard command object. The --tags flag on the command line implies using refs/tags/* as a push specification. Add this to the standard command object. Change-Id: Iaef200b17cce77604548dbfb15cf2499b10687b5 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2011-03-15Make --git-dir optional for 'jgit init'Philipp Thun1-1/+2
For compatibility reasons with regards to native git and also to make the init command easier to use from the command line, argument --git-dir should not be required. Additionally the path created in case --git-dir is not supplied now is canonical and thus easier to read. Change-Id: Idb7d77e983a78c4b21fbf232fc1e75ef581e5ed1 Signed-off-by: Philipp Thun <philipp.thun@sap.com>
2011-03-14Always fetch tags during cloneShawn O. Pearce1-0/+2
C Git always fetches tags during clone, even if the tag doesn't point to an object that was fetched by the branch specifications. Match that behavior, as users expect it. Bug: 326611 Change-Id: I81a82b7359a9649f18a172219da44ed54e77ca2f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2011-03-11Add -o option to commit commandPhilipp Thun3-3/+23
This change adds the --only/ -o option to the commit command. Change-Id: I44352d56877f8204d985cb7a35a2e0faffb7d341 Signed-off-by: Philipp Thun <philipp.thun@sap.com>

Back to the top