Posts Tagged ‘Git’

Better Line Endings Managing in IntelliJ IDEA 12

Wednesday, October 17th, 2012

It happens quite often, that version control is used by people working on different platforms. This is why problems with line endings may appear. If you ever read the article from GitHub, you might already know, that Git can automatically address these problems. You just need to set git config --global core.autocrlf true on Windows or git config --global core.autocrlf input on Linux and OS X.

However not everyone follows the instructions and setups VCS correctly. That’s why we have made a couple of improvements in IntelliJ IDEA 12 to make life easier.
(more…)

Git Branches for Multi-root Projects

Thursday, August 2nd, 2012

Sometimes there is a need to have multiple Git repositories within a single project. Since long ago IntelliJ IDEA is able to execute many Git operations on all roots at once: Commit, Update Project, Push. Now multi-repository support has come to branches.

In IntelliJ IDEA 11.1 we have implemented two different approaches for multi-root branches. (more…)

Simpler and more powerful UI for Git branches

Wednesday, March 21st, 2012

Lightweight and fast branches are one of the major features and advantages of Git. We in Jetbrains want to make workflow with branches even more convenient and simple than it is in command line.

You might have noticed that in IntelliJ IDEA 11.0 we’ve added new interface to checkout branches from Git. In IntelliJ IDEA 11.1 we have polished the look and feel, and made it more functional. The main goal of new interface is to concentrate on the most common use cases. Let’s take a look at the features which the IDE offers to manage Git branches.

(more…)

New in 11: Git log gets more power

Monday, November 14th, 2011

The most exciting news for me is that now in forthcoming IntelliJ IDEA 11, we show Git revisions graph!

Now that IntelliJ IDEA can visualize commits links, we’ve added context actions to tag a commit, create (and checkout) new branch, and checkout a selected revision.

I want to specifically mention the highlight actions — now you can see what commits are in “ancestors subgraph” for a selected commit. By default, IntelliJ IDEA shows HEAD subgraph, i.e. you see what commits you have in your working tree now.

It is really convenient when you are checking what commits went into some tag (or branch).

To find any commit in git log (in already shown part), use the new “Goto Commit” action — type commit hash, or description fragment, or branch or tag name, and be navigated to it.

And, finally — when browsing history, sometimes you work with a set of commits and need to track this set.

Now you can mark commits by simply pressing Space and they get stared.

New in 11: Create GitHub Gists from IDE

Thursday, September 29th, 2011

Helo guys,

We know that many of you are keen on GitHub and use gists in your everyday work. We are excited to tell you that now you can share your code instantly from the IDE. Here is a small demo of how it works.

Open any file you want to share with others or even a selection within this file, invoke the context menu and select Create Gist… menu item.

At first you’ll be asked to login to GitHub to be able to create personal gists. The IDE stores your GitHub password inside a built-in secure password storage, so you can be asked for your master password to access the storage.

Anyway if you don’t want to use it, you’ll see the GitHub login form:

Note that even without any account on GitHub you still can create gists for instant sharing of code samples with anyone.

And here we are, enter a description, select the desired gist options and press OK to create it!

This functionality will be available in the nearest IntelliJ IDEA 11 EAP and in all IntelliJ based products. It is still under development, so it is a subject to change and improve, so your feedback and thoughts are welcome. For example, we’re thinking about a preview editor to modify your code before publishing it.

Also we have a bunch of feature requests about GitHub integration in our issue tracker. Feel free to comment and vote for them. That’s all for now. Enjoy!

Develop with pleasure!
JetBrains Team

New in 10.5: Check TODO, patch into shelf & GNOME Keyring

Tuesday, April 5th, 2011

There’s been a number of new things we’ve added in IntelliJ IDEA 10.5 related to version control support. You can try them already in a latest EAP build. And here’s a quick overview.

Do not forget things… TODO!

Now you can easily ensure you haven’t forgotten to implement a method, and double-check the important places in your code before commit. Just mark those places in code with TODO.

IntelliJ IDEA’s new “Check TODO” before commit inspection will notify about all new and edited TODO items.

It will also confirm about TODO items in the changed fragments (in case they are not actual any more).

You can use TODO filter with this inspection — if you want to pay attention only to TODO items of a special kind.
"Check TODO" before commit handler option in Commit dialog

You can further review TODO items in the changed lines:
Review TODO items in changed code

Import patches into IntelliJ IDEA shelf

You can now import a patch into shelf.

It is quite useful when you review someone’s code and use patches for communication.
Import action in Shelf context menu

Later, you can unshelve it using the new detailed Unshelve… action, which opens a dialog similar to ‘Apply Patch’ and allows setting any bases for the patch parts (in case some files or directories had moved since then).

You can also import patches directly from the Apply Patch dialog.

Subversion. GNOME Keyring support

GNOME Keyring support has been implemented by svnkit, so you can use it in IntelliJ IDEA now.

As svnkit folks say, it is in experimental phase, and a special JVM key should be used to enable it. So, please read the details.

This is it for now. Let us know what you think.

And make sure you are using the latest IntelliJ IDEA 10.5 EAP build when you get to try these and other new features.

Advanced GitHub Integration: Rebase My GitHub Fork

Tuesday, February 1st, 2011

Hello guys,

We’ve already described the basic GitHub integration features on IntelliJ IDEA before. Here comes more advanced stuff.

We’ve made lots of improvements since then, but the main new thing to talk about is GitHub rebase support. GitHub provides an easy way of forking someone’s repository, however it is pretty natural for the development to keep your sources up-to-date. In the latest version of the IntelliJ GitHub plugin you can rebase your own fork onto the origin in several clicks.

Here is a small howto:

  • Let us consider that we had forked someone’s repository on the github.com, and have checked out your own fork using Checkout From the GitHub action. In this case you’ll notice a new menu item: Version Control | Git | Rebase my GitHub fork
  • In order to rebase onto the origin repository it is necessary to add it as new remote. But you’ll be prompted to add it automatically.
  • After having your origin successfully configured you’ll be able to rebase your own fork.

And yet another small but useful feature is the ability to quickly browse your code on the Internet. Open in browser is available from the context menu.

All GitHub features are available even if you have your own GitHub installation (http://fi.github.com), just configure the GitHub host in IDE settings and voila, everything works out of the box!

The next major feature scheduled is the support for github pull requests and full roadmap is available here. Do not hesitate to let us know what you think about and if you’d like any other GitHub specific functionality to be added. Enjoy using GitHub with IntelliJ GitHub integration!


And watch this short screencast demoing creating a new GitHub repository from IntelliJ IDEA project and cloning an existing one as a new project (also available at JetBrains.TV).


-Develop with pleasure!
JetBrains Team

IntelliJ IDEA 10 RC — Git log got hot

Tuesday, November 30th, 2010

It is snowing outside our office but it is getting hotter and hotter inside. Guess why? That’s right, releases are getting nearer. RubyMine team did theirs yesterday. IntelliJ IDEA 10 is close enough too.

Indeed, we’ve just published IntelliJ IDEA 10 Release Candidate!

One major thing we pushed to this build is a significantly reworked Git log view (see screenshot below).
There’s also a number of other Git-related changes plus many stabilizing fixes throughout the IDE. See the complete list in this build release notes.

So, if you have some feedback for us, please speak now! We are listening as carefully as we push our changes now!

Stay tuned for more releases from JetBrains and for IntelliJ IDEA 10 announcement soon!

GitHub integration in IntelliJ IDEA: base features

Friday, October 29th, 2010

Hello guys,

We are pretty sure that many of you have heard about Github and some are probably using it for your projects. We are excited to reveal the coming GitHub support in IntelliJ IDEA 10 and in other IntelliJ based products.

With a new GitHub plugin installed you’ll be able to checkout your existing GitHub repository and auto-open it as a project or share a project on GitHub instantly.

You can checkout an existing project and start coding in a few seconds!

And once you decide to share your work:

This GitHub integration is available in the latest IntelliJ IDEA EAP.

Please note that existing functionality should be considered as a preview and set of features will be extended in the nearest future. See the what we did and what we plan to do in a roadmap. and feel free to share your thoughts about it.

- Develop with pleasure!
IntelliJ IDEA Team

IntelliJ IDEA 10 EAP (98.231) — Happy Halloween!

Wednesday, October 27th, 2010


New IntelliJ IDEA 10 EAP build is ready for your testing.

Some noteworthy changes are:

  • Improved completion in XML. Smart completion plus new Generate / XML Tag action from context menu.
  • New GitHub integration. Try looking under ‘Checkout from VCS’ action.
  • In-place introduce variable. Refactor you Java code with no popups.
  • Many other fixes and improvements since the last update.

Download the build and enjoy!

Happy Halloween!