Git Integration in the IDE

Go Up to Version Control Systems in the IDE

The Version Insight feature integrates support for the Git version control system into the IDE.

For more information about Git, see http://www.git-scm.com/

Features of Git in the IDE

For any file that is managed by Git:

• The History Manager displays both the local file history information and the Git history information. For example, Git comments and history are available on the Information tab of the History Manager.
• You can compare or diff versions of the file that were created in and are managed by an external Git system, even if the file was not created or backed up by the IDE.
• You can perform common Git commands such as:
  • Clone (Git) (retrieve the files from a remote Git repository) and Pull (Git) (update your local copy of the remote Git repository)
  • Commit (Git) (send your local changes to your local repository)
  • Push (Git) (push your local changes to a remote repository)
  • Show Log (click the Information tab on the History Manager)
  • Diff (compare two versions of a file)
  • Blame (Annotate) (displays most recent revision number; click on the History Manager)

Git Command Equivalents in RAD Studio

If you are familiar with Git, take a look at this useful table that describes how to perform common Git tasks in the RAD Studio IDE.

Enabling Git in RAD Studio

Git support is not enabled by default. To enable Git in the IDE, use the following steps:

1. Download and install Git in your system.
2. In the IDE, go to Tools > Options > Version Control > Git.
3. Insert the path to the installed Git executable (git.exe) in your system. For instance, in a Windows system the Git executable is located in:

   C:\Program Files\Git\cmd\git.exe

4. Change other parameters as you need.
5. Click OK to close the wizard.

To implement the Git features, the IDE does not add anything to your project. Instead, the IDE simply uses the Git information that is stored in your local repository (under the version control system).

Git Setup

Once you have Git on your system, you need to set your user name and e-mail address. Git uses the user name and the e-mail address in every Git commit.

To set up your user name and e-mail address:

1. Tools > Options > Version Control > Git
2. Enter the user name and the e-mail in the corresponding fields.
3. Click the OK button.

Topics

Equivalent commands

• Git Command Equivalents in RAD Studio

Repository Actions

• Cloning a Copy of a Repository
• Adding a Project to Version Control
• Adding a File to Version Control
• Updating a Local Copy of a File under Version Control
• Committing Changes to Git Version Control
• Pushing Your Changes to the Remote Repository

Log and History Actions

• Viewing History and Revisions
• Viewing Version Control Comments
• Displaying the Version Control Log
• Using the Annotation Feature

Difference View Actions

• Diff'ing (Comparing) Versions of a File
• Adding a New Difference Viewer
• Installing an Alternate Difference Viewer
• Using an External Difference Viewer

Reverting Changes

• Reverting Changes
• Cleaning the Local Repository

Dialog Boxes and Panes

• Clone (Git)
• Commit (Git)
• Git Login
• Import Pane
• Log Pane
• Pull (Git)
• Remove Git Authentication Credentials

Troubleshooting

• Unknown User Name Error (Git)

See Also

• Git Software Project: http://git-scm.com/
• History Manager
• Commit (Git)
• Clone (Git)
• Log Pane
• Import Pane
• Select Program
• Select Project or Project Group to Open