Editor's Pick

“Tracking Branches” And “Remote-Tracking Branches”

Both Tracking Branches and Remote Tracking Branches are created on the git client when a git clone command is used.

Merging Branches With a Conflict: Conflicts And Resolutions

Learn what to do when you have a conflict when merging branches in Git. 30+ additional Git Tutorials.

About GitGuys

GitGuys was created by The Git Guys: Tim Flagg and Matthew R. Laue, founders of Akiri Solutions to provide a place for learning git.

Adding and Removing Remote Branches

Adding and removing remote branches using git branch is explained in this tutorial. Click on this link to learn more about using git branch with remote branches.

Git Topics

Git Repositories – Just Tell Me What I need to Git Going!

Most of the time, you will likely use just a handful of git commands: git add to tell git this file is ready to be committed to the git repository.

Git Commits And Referring To Commits | GitGuys

Commands discussed in this section are git commit, git log, and git show. When you use the git commit command to commit/check-in/submit to the git repository:

Git Object: tree

A git tree object is very similar to a filesystem directory. Filesystem directories refer to other directories and files, while git trees refer to other git trees and git blobs:

Git Diff Command Explained

See how the git diff command can be used to show you the difference between the version of a file in the working directory, index and most recent commit.

The Configuration File – “remote” Section – Git Config

In this tutorial you get dirty and find out what is really going on with git conf by exploring in the .git/config file by using the git remote commands.

Stay on top - Get the daily news in your inbox

Latest Git Updates

Git Merge – Merging Branches Without Conflict

Examples of when would you might want to merge branches using git merge are explained in detail in this tutorial. 30+ additional, free tutorials available.

Git Object Store: Creating the Sample Working Directory

The instructions below show how the files and directories were created and added to the git object store that is discussed in the tutorial "Git object: Tree."

Git Object: Tag | Git Tag

A git tag can be used to give a name to a git commit . We show how to tag the current state as, say, "1.0beta". The tag includes:

Git Glossary

Common Ancestor When merging a file with conflicts: The version of the file that current and other branches originated from. Dirty working directory If files have been updated in the working directory after they were updated in the index then the working directory is considered "dirty". The working

The Configuration File – “remote” Section – Git Config

In this tutorial you get dirty and find out what is really going on with git conf by exploring in the .git/config file by using the git remote commands.

Git Remotes: Fun Commands You Can Use

Git Remote commands and examples for their use on GitGuys Git Tutorials.

Temporarily Stashing Your Work

Git Stash is used when you want to record the current state of the working directory and index, without committing, to come back to complete later.

The .git Directory

If you haven't explored the .git directory yet, it's worth the hike. It is your project's root and we explain what is in it and why it is important.

Git Resources

8 Reasons for Switching to Git

Switching to Git can decrease the time required for managing your code base, increased time for coding. Git automates many of the tasks that you need to do while managing your code, saving you time.

Git Repositories

How to Recover a Deleted File From a Git Repository

Recovering a deleted file from the git repository is easy if you know the method and commands. This short tutorial walks you through the process.