Git

Git

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

tip

Interactive rebase
Using interactive rebase in IntelliJ IDEA

tip

Selectively commit changes
Selectively Commit Changes to a File

tip

Annotate with Git Blame: Commit
Look at the commit a change was part of from Annotate with Git Blame

tip

Annotate with Git Blame: Show Diff
Look at the diff a change was part of from Annotate with Git Blame

tip

Git
Git tool window

Part of tutorial

Project from version control
Cloning a project from version control

Part of tutorial

Summary and Shortcuts
Importing projects into IntelliJ IDEA Summary

tutorial

GitLab Merge Requests
Working with GitLab Merge Requests

tutorial

Contributing to open source software; creating a pull request
Contribute code to someone else's GitHub project with a pull request

Part of tutorial

Creating the pull request
How to create a pull request on GitHub

Part of tutorial

Making changes to code
Making and committing our changes

Part of tutorial

Introduction
Contributing to open source software

Part of tutorial

Getting the project
Forking and cloning the project

Part of tutorial

Negotiating the review process
Review and hopefully get your pull request merged

Part of tutorial

Summary and Shortcuts
Contributing to open source software Summary

tip

Resolve Conflicts
Let the IDE help in the tricky business of resolving merge conflicts.

tip

Move Work Aside With Stash
Use git's stash to move uncommitted work aside temporarily.

tip

Move Work Aside With Shelve
Move uncommitted work aside when you need to work on another branch.

tip

Rebase Feature Branch
Get your feature branch caught up with changes on the main branch.

tip

Cherry Pick a Commit to a Different Branch
Oops, you committed your code to the wrong branch… You could redo the work, but you don't want to!.

tip

Autocomplete File Names in Commits
How to reference filenames in a commit in WebStorm.

tip

See Unsynced Commits
See what's happening on that other branch.

tip

Compare With Branch
See the changes in another branch's commits.

tip

Browse Branch's Commits
Review the changes in main before bringing them to your branch.

tip

Only Commit Some Changes
Unselect files or changed regions within files during the commit process.

tip

Fix Your Work with Amend Commit
Put some missing work back into your last commit, before you push.

tutorial

Marco Codes - Git
5 Git Tricks you need to know

tip

Use Local History to Avoid Disaster
Use the IDE's built-in history facility to recover changes when VCS can't help you.

tip

Undo Last Commit
Undo a commit...without misery.

tip

Edit Commit Message
Edit the wording in your last commit message, after you committed.

tutorial

Git interactive rebase
How to clean up your Git commit history with Git interactive rebase

tip

Manage VCS Changelists in IntelliJ IDEA
Group and commit changes related to certain tasks

tutorial

Creating a Project from GitHub
How you can create an IntelliJ IDEA project from your code in GitHub

tutorial

Sharing your Project on GitHub
How you can share a local project to GitHub

tip

Resolve Merge Conflicts in VCS
Use VCS options in IntelliJ IDEA to resolve merge conflicts visually in the editor

tip

Monitor Incoming and Outgoing Commits
Want to know if your branch has new commits? Here's how.