Investigate changes in Git repository

• Search through the list of commits by entering full commit names or messages or their fragments, revision numbers, or regular expressions.

• Filter the commits by branch or favorite branches, user, date, and folder (or root and folder for multi-root projects).

• Click the Go to Hash/Branch/Tag icon on the toolbar or press Ctrl0F and specify a commit hash, tag or the name of a branch you want to jump to (you will be taken to the latest commit in that branch).

• Click an arrow to jump to the next commit in a long branch:

  

• Press the 0← and 0→ keys to jump to the parent/child commit. This is especially useful if you have commits to different repositories and multiple branches all mixed in the Log tab of the Git tool window Alt09.

1. Open the Git tool window Alt09 and switch to the Log tab.

2. Select a commit and choose Show Repository at Revision from the context menu.

The Repositories tool window will open containing the snapshot of your project or directory at the selected revision.

• Select any two commits in the Log tab of the Git tool window Alt09 and choose Compare Versions from the context menu.

  The Changes tool window with a list of files modified between the selected commits opens. You can view the diff for any file by clicking or pressing Ctrl0D.

1. Select the necessary file in any view (the Files tool window, the editor, the Changes view, and so on).

2. Select Git | Show History from the main VCS menu or from the context menu of the selection. The History tab is added to the Git tool window showing the history for the selected file and allowing you to review and compare its revisions.

3. To identify which changes were introduced in a specific revision, select it in the list. On the right side of the panel the diff is instantly shown.

4. To view the diff of the whole file in the dedicated diff viewer, select it in the list and press Ctrl0D or click the button on the toolbar. The Differences Viewer will open showing what has changed in this revision.

1. Select a directory or multiple directories in the Files tool window and choose Git | Show History from the context menu.

2. A new tab is added to the Git tool window Alt09 that shows commits filtered by the selected folders.

1. Open the Git tool window Alt09 and switch to the Log tab.

2. Select the commit you are interested in, and in the right pane select the file.

3. Click the button on the toolbar.

• In the Log tab of the Git tool window Alt09, select the merge commit you are interested in.

  • If no conflicts were detected and resolved during the merge, DataGrip will display the corresponding message in the Changed Files pane and suggest reviewing changes that originate from both parents:

    

    Select the required file from one of the nodes and click the Show Diff icon on the toolbar or press Ctrl0D. The Differences Viewer will show a two-panel diff allowing you to compare the current version with the selected parent.

  • If conflicts occurred during the merge, the Changed Files pane will show you a list of files merged with conflicts.

    Select the required file and click the Show Diff icon on the toolbar or press Ctrl0D. The Differences Viewer will show a three-panel diff allowing you to compare the current version with each of its parents, and see how exactly conflicts were resolved.

• Right-click the gutter in the editor or in the Differences Viewer and select Annotate with Git Blame from the context menu.

  You can assign a custom shortcut to the Annotate command: go to the Keymap page of the IDE settings CtrlAlt0S and look for Version Control Systems | Git | Annotate.

  To close annotations, right-click the gutter in the editor or in the Differences Viewer and select Close Annotations from the context menu.

• Right-click the annotations gutter and select Options from the context menu:

  • Ignore Whitespaces: whitespaces will be ignored (git blame -w). This means that annotations will point to the previous meaningful commit.

  • Detect Movements Within File: when a commit moves or copies lines within the same file, such change will be ignored (git blame -M). This means that annotations will point to the previous meaningful commit.

  • Detect Movements Across Files: when a commit moves or copies lines from other files that were modified in the same commit, such change will be ignored (git blame -C). This means that annotations will point to the previous meaningful commit.

  • Show Commit Timestamp: select this option if you want DataGrip to show the commit timestamp in the Annotations view instead of the time when a change was authored.

1. Press CtrlAlt0S to open the IDE settings and then select Appearance & Behavior | System Settings | Date Formats.

2. Click the Date Time Pattern field next to VCS Annotate and specify the date format that you want to use for VCS annotations. See patterns reference.