Chai Docs Search Ctrl K Auto

Home On this page

HTML diff stash and Tags Overview

Git diff

Django How to read the diff

Comparing Working Directory and
Git and Github Staging Area
Git and Github Learn and community Comparing Staging Area with Repository

Terminology Comparing between branches

Comparing Specific Commits:
Git behind the scenes
Git Stash
Branched in git
Naming the stash
diff stash and Tags
View the stash list
Rebase and reflog Apply the stash
getting started with Github Git diff Apply the specific stash
Applying and dropping the stash
C++ New The git diff is an informative command that shows the differences between two commits. It is used Drop the stash

SQL to compare the changes made in one commit with the changes made in another commit. Git consider Applying stash to a specific branch

the changed versions of same file as two different files. Then it gives names to these two files and Clearing the stash
DevOps Stuff
Git Tags
shows the differences between them.
Creating a tag
Create an annotated tag

How to read the diff List all tags

Tagging a specific commit
Push tags to remote repository
a -> file A and b -> file B
Delete a tag
---- indicates the file A
Delete tag on remote repository
+++ indicates the file B
@@ indicates the line number

Here the file A and file B are the same file but different versions.

Git will show you the changes made in the file A and file B. It will also show you the line number
where the change occurred along with little preview of the change.

Comparing Working Directory and Staging Area

git diff

This command shows the unstaged changes in your working directory compared to the staging area.
This command alone will not show you the changes made in the file A and file B, you need to provide
options to show the changes.

Comparing Staging Area with Repository

git diff --staged

This command shows the changes between your last commit and the staging area (i.e., changes that
are staged and ready to be committed).

Comparing between branches

git diff <branch-name-one> <branch-name-two>

This command compares the difference between two branches. For example:

Another way to compare the difference between two branches is to use the following command:

git diff branch-name-one..branch-name-two

Comparing Specific Commits:

git diff <commit-hash-one> <commit-hash-two>

This command compares the difference between two commits.

Git Stash
Stash is a way to save your changes in a temporary location. It is useful when you want to make
changes to a file but don’t want to commit them yet. You can then come back to the file later and
apply the changes.

Conflicting changes will not allow you to switch branches without committing the changes. Another
alternative is to use the git stash command to save your changes in a temporary location.

git stash

This command saves your changes in a temporary location. It is like a stack of changes that you can
access later.

Naming the stash

You can also name the stash by using the following command:

git stash save "work in progress on X feature"

View the stash list

You can view the list of stashes by using the following command:

git stash list

Apply the stash

You can apply the stash by using the following command:

git stash apply

Apply the specific stash

You can apply the specific stash by using the following command:

git stash apply stash@{0}

Here stash@{0} is the name of the stash. You can use the git stash list command to get the name
of the stash.

Applying and dropping the stash

You can apply and drop the stash by using the following command:

git stash pop

This command applies the stash and drops it from the stash list.

Drop the stash

You can drop the stash by using the following command:

git stash drop

Applying stash to a specific branch

You can apply the stash to a specific branch by using the following command:

git stash apply stash@{0} <branch-name>

Clearing the stash

You can clear the stash by using the following command:

git stash clear

Git Tags
Tags are a way to mark a specific point in your repository. They are useful when you want to
remember a specific version of your code or when you want to refer to a specific commit. Tags are like
sticky notes that you can attach to your commits.

Creating a tag
You can create a tag using the following command:

git tag <tag-name>

This command creates a new tag with the specified name. The tag will be attached to the current
commit.

Create an annotated tag

You can create an annotated tag using the following command:

git tag -a <tag-name> -m "Release 1.0"

This command creates an annotated tag with the specified name and message. The tag will be
attached to the current commit.

List all tags

You can list all tags using the following command:

git tag

This command lists all the tags in your repository.

Tagging a specific commit

You can tag a specific commit using the following command:

git tag <tag-name> <commit-hash>

Push tags to remote repository

You can push tags to a remote repository using the following command:

git push origin <tag-name>

Delete a tag
You can delete a tag using the following command:

git tag -d <tag-name>

Delete tag on remote repository

You can delete a tag on a remote repository using the following command:

git push origin :<tag-name>

Conclusion
In this section, we have learned about the different commands related to diff, tags and stash in git.
These are not main stream commands but they are very useful in certain situations. By the end of this
section, you should have a good understanding of how to use git effectively.

Previous Next
Branched in git Rebase and reflog