Git Stash Basics Quiz

The git stash command is used to temporarily store uncommitted changes in your working directory, allowing you to revert to a clean state without losing your progress. This is particularly useful when you need to switch branches or pull updates without committing incomplete work.

Both commands, `git stash save 'message'` and `git stash push -m 'message'`, effectively save changes to the stash with a descriptive message. While `git stash save` is the older syntax, `git stash push -m` is the newer, preferred method that explicitly allows for a message, making both options valid.

To view all stashed changes in a Git repository, you use the command `git stash list`. This command displays a list of all stashes, including their identifiers and messages, allowing you to see what changes have been temporarily saved without applying them to your working directory.

'git stash pop' applies the changes saved in the most recent stash to the working directory and simultaneously removes that stash entry from the stash list. This command is useful for retrieving temporarily stored changes while keeping the stash list organized by eliminating the applied stash.

'git stash pop' and 'git stash apply' both restore stashed changes, but they differ in how they handle the stash afterward. 'pop' removes the stash entry after applying the changes, while 'apply' keeps the stash intact for potential future use. This distinction is crucial for managing your stashed changes effectively.

You can apply a specific stash using either `git stash apply stash@{n}` or `git stash pop stash@{n}`. The former applies the changes without removing the stash, while the latter applies the changes and removes the stash from the list. Both commands effectively allow you to retrieve a specific stash.

The command `git stash clear` is used to remove all stashed changes in a Git repository. Unlike other options, it specifically targets the entire stash list, effectively clearing it without the need to specify individual stashes. This is useful for maintaining a clean working environment by eliminating unnecessary stashed changes.

Both `git stash show stash@{0}` and `git stash show -p stash@{0}` display the changes in a specific stash. The first command provides a summary, while the second shows a detailed patch of the changes. Therefore, both commands effectively reveal the modifications stored in the specified stash.

Git stash saves both staged and unstaged changes. When you run `git stash`, it captures the current working directory state, including any modifications to tracked files, regardless of whether those changes have been staged or not. This allows you to temporarily set aside your work and revert to a clean working directory.

Using the -u or --include-untracked flag with the git stash command allows you to stash not only tracked changes but also untracked files. This is useful when you want to temporarily save your work, including new files that haven't been added to the staging area, without committing them.

To create a new branch from a stashed change, you use the command `git stash branch branchname`. This command applies the stashed changes to a new branch named "branchname" and simultaneously removes the stash entry, allowing you to continue working on those changes in the new branch context.

Stashed changes are temporary and stored locally in your Git repository. They are not automatically pushed to a remote repository, meaning they won't be backed up unless explicitly applied and committed. This ensures that stashed changes remain private and are not shared until the user decides to do so.