How to add a file to to your git?

To add a file to your git local repository Press Ctrl + Alt + A ( ⇧⌘A search git add)or Right click on the file you want to add then select Git -> Add. You can select the root folder of the project to add everything.

How to do a git commit?

To do a $git commit you press Ctrl + K

This dialogue allows you to select the files which you would like to commit

• This will show you new files in green
  , modified files in blue and deleted files in grayed out color.
• Optionally you can select Reformat code, Rearrange code, Optimize imports and Clean up on the fly before you commit
• A click on the commit button will do a normal commit until you press the little down arrow to select other options like commit & push
  or Create patch
• Click on the Details at the footer to see the changes for each file. You can even double click on the file to see the changes. To go through each changes you’ve made for each file one by one Press F7 or click on the UP or DOWN inside the Difference Viewer Dialogue like below

For mac users, Since I don’t know about the shortcuts I would recommend you to press ⇧⌘A to find the appropriate shortcut and type the search term given inside the parenthesis in this post for each shortcut. It is an easiest way if you don’t remember all the shortcuts

How to do a git push?

To do a $git push press Ctrl+Shift+K ( ⇧⌘A search git push), you will see the list of all your commit there. On the right side you can see the changes of the files you’ve made. Click on the Push button to make a git push to your remote repository.

Unfortunately at this point If you’ve not configured your remote repo to your git local repo, you can not add it using the IDE. You’ve to do that from your terminal. There is a feature request to jetbrains which is still open https://youtrack.jetbrains.com/issue/IDEA-87099

on terminal type “$git remote add remoteName remoteUrl” to add remote repo as of now

Adding files to git, committing to git and pushing to remote might look like an easy job even from terminal at this moment. But the real power of Android Studio comes in when you take a pull with merge conflicts.

How to take a git pull?

Press Ctrl+T ( ⇧⌘A search git pull) a pop dialogue which says Update project will ask you to select the Update type and will give you an option to Clean working tree before update using stash or shelve method like below

• Merge: choose this option to have the merge strategy applied. The result is identical with that of running git fetch ; git merge or git pull — no-rebase.
• Rebase: choose this option to have the rebase strategy applied. The result is identical with that of running git fetch ; git rebase or git pull — rebase.
• Branch Default: choose this option to have the default command for the branch applied. The default command is specified in the branch.<name> section of the .git/config configuration file.