$ git stash pop

From here, you can continue your work and commit it when ready.

Coming up we have a short video demo’ing this in action.

Git log

At this point you might be familiar with the commandgit log, which allows you to view the commit history of the branch you currently have checked out:

Git Log output shows recent commit history

There are other ways you can usegit login order to view recorded changes. Here are a few examples:

• git log --onelineshows the list of commits in one line format.

Git Log online output shows recent commit history all in one line

• git log -S "keyword"displays a list of commits where the number of occurrences of the keyword changes within at least one file via addition, deletion, or modification. In the screenshot below, we usegit log -S "Add"to find any commits where the number of occurrences of “Add” within a file changes.

The output of `git log -S "Add"` finds a commit where the number of occurrences of "Add" changes within a file.

• git log --oneline --graph---graphDisplays a visual representation of how the branches and commits were created in order to help you make sense of your repository history. When used alone, the description can be very lengthy, so you can combine the command with--onelinein order to shorten the description.

Git log --online --graph outputs a graphical representation of commits, showing where branches were created earlier and merged.

Git commit amend

Git’s--amendflag is extremely useful when updating a commit, it allows you to correct mistakes and edit commits easily instead of creating a completely new one.

Let’s say you finish working on a lengthy feature and everything seems to be working fine so you commit your work. Shortly after, you realize you missed a few semicolons in one of your functions. You could technically create a new commit, but ideally, you want to keep all commits specific, clean, and succinct. To avoid creating a new one, you could create your changes, stage them withgit addand then type the commandgit commit --amendto update your previous commit.

It’s important to note that although it seems like--amendis simply updating the commit, what Git actually does is replace the whole previous commit. For this reason, when you execute the commandgit commit --amend, your terminal editor asks you to update your commit message:

git-amend

However, if you want to keep the same commit message, you can simply add the flag--no-edit:

$ git commit --amend --no-edit

Git alias commands

When grouping commands together, you can end up writing very long lines of Git commands in the terminal such as:

$ git log --pretty=format:"%h %s" --graph

Fortunately, Git offers a helpful feature that can make your Git experience simpler, easier, and more familiar: aliases.

If you have a set of commands that you use regularly and want to save some time from typing them, you can easily set up an alias for each command using Git config.

Below are a couple of examples:

$ git config --global alias.co "checkout"
$ git config --global alias.br "branch"
$ git config --global alias.glop "log --pretty=format:"%h %s" --graph"

Once the aliases are configured, next time you want to check out to another branch you could type the command:

$ git co example_branch

Instead of:

$ git checkout example_branch

Using Git aliases can create a much more fluid and efficient workflow experience when using Git. By getting creative with your aliases, you’re able to wrap a sequence of Git commands into one in order to save time and effort.

'The Codecademy Team, composed of experienced educators and tech experts, is dedicated to making tech skills accessible to all. We empower learners worldwide with expert-reviewed content that develops and enhances the technical skills needed to advance and succeed in their careers.'