Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

Wiki Markup
{div:class=navigation}
{table:width=100%}
{tr}
{td:width=33%}{align:left}[Previous|Intentions] {span:class=sep}\| {span}{span:class=text}Intentions{span}{align}{td}
{td:width=33%}{align:center}[Top|Quick Start] {span:class=sep}\| {span}{span:class=text}Quick Start{span}{align} {td}
{td:width=33%}{align:right}[Next|Debugger] {span:class=sep}\| {span}{span:class=text}Debugger{span}{align} {td}
{tr}
{table}
{div}
Wiki Markup
{redirect:https://www.jetbrains.com/idea/help/version-control-basicswith-intellij-idea.html|delay=0}

Info
iconfalse

One of the nicest things about IntelliJ IDEA is its seamless integration with major version controls like Git, GitHub, Subversion, Mercurial, Perforce, TFS, CVS, Visual SourceSafe and Rational ClearCase.

...

When you click the annotation, you will see the detailed information about the corresponding commit.

7. Useful shortcuts

  • Commit current changelist

    Wiki Markup
    {span:class=shortcut}Ctrl{span}
    +
    Wiki Markup
    {span:class=shortcut}K{span}
    (
    Wiki Markup
    {span:class=shortcut}Cmd{span}
    +
    Wiki Markup
    {span:class=shortcut}K{span}
    for Mac)

  • Update the project

    Wiki Markup
    {span:class=shortcut}Ctrl{span}
    +
    Wiki Markup
    {span:class=shortcut}T{span}
    (
    Wiki Markup
    {span:class=shortcut}Cmd{span}
    +
    Wiki Markup
    {span:class=shortcut}T{span}
    for Mac)

  • Mark selected files and folders as added

    Wiki Markup
    {span:class=shortcut}Ctrl{span}
    +
    Wiki Markup
    {span:class=shortcut}Alt{span}
    +
    Wiki Markup
    {span:class=shortcut}A{span}
    (
    Wiki Markup
    {span:class=shortcut}Alt{span}
    +
    Wiki Markup
    {span:class=shortcut}Cmd{span}
    +
    Wiki Markup
    {span:class=shortcut}A{span}
    for Mac)

  • Mark selected files and folders as changed (checked out) via

    Wiki Markup
    {span:class=shortcut}Ctrl{span}
    +
    Wiki Markup
    {span:class=shortcut}Alt{span}
    +
    Wiki Markup
    {span:class=shortcut}E{span}
    (
    Wiki Markup
    {span:class=shortcut}Alt{span}
    +
    Wiki Markup
    {span:class=shortcut}Cmd{span}
    +
    Wiki Markup
    {span:class=shortcut}E{span}
    for Mac)

  • Show diff (available in the

    Wiki Markup
    {span:class=shortcut}Changes{span}
    tool window) via
    Wiki Markup
    {span:class=shortcut}Ctrl{span}
    +
    Wiki Markup
    {span:class=shortcut}D{span}
    (
    Wiki Markup
    {span:class=shortcut}Cmd{span}
    +
    Wiki Markup
    {span:class=shortcut}D{span}
    for Mac)

  • Move changes to another change list (available in the

    Wiki Markup
    {span:class=shortcut}Changes{span}
    tool window) via
    Wiki Markup
    {span:class=shortcut}F6{span}

  • Push commits to remote repositories via

    Wiki Markup
    {span:class=shortcut}Ctrl{span}
    +
    Wiki Markup
    {span:class=shortcut}Shift{span}
    +
    Wiki Markup
    {span:class=shortcut}K{span}
    (
    Wiki Markup
    {span:class=shortcut}Cmd{span}
    +
    Wiki Markup
    {span:class=shortcut}Shift{span}
    +
    Wiki Markup
    {span:class=shortcut}K{span}
    for Mac)

8. Commit options

When committing changes, IntelliJ IDEA lets perform a variety of operations: change the file set to commit to, join the changes with the previous commit by using the

Wiki Markup
{span:class=shortcut}Amend commit{span}
option, reformat the changed code, optimize imports, ensure that there are no inspection warnings, update the copyright information, or even upload the changes to a remote FTP server.

...

This is it for the VCS basics. See the following tutorials for more advanced topics.

Wiki Markup
{div:class=navigation}
{table:width=100%}
{tr}
{td:width=33%}{align:left}[Previous|Intentions] {span:class=sep}\| {span}{span:class=text}Intentions{span}{align}{td}
{td:width=33%}{align:center}[Top|Quick Start] {span:class=sep}\| {span}{span:class=text}Quick Start{span}{align} {td}
{td:width=33%}{align:right}[Next|Debugger] {span:class=sep}\| {span}{span:class=text}Debugger{span}{align} {td}
{tr}
{table}
{div}