#Git stash command Patch#

When no is given, it removes the latest one. Note that those states will then be subject to pruning, and may be impossible to recover (see Examples below for a possible strategy).ĭrop Remove a single stashed state from the stash list. Since the stash is applied on top of the commit that was HEAD at the time git stash was run, it restores the originally stashed state with no conflicts.Ĭlear Remove all the stashed states. This is useful if the branch on which you ran git stash save has changed enough that git stash apply fails due to conflicts. When no is given, applies the latest one. When no is given, is assumed.Īpply Like pop, but do not remove the state from the stash list.īranch Creates and checks out a new branch named starting from the commit at which the was originally created, applies the changes recorded in to the new working tree and index, then drops the if that completes successfully. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally). If the -index option is used, then tries to reinstate not only the working tree(cqs changes, but also the index(cqs ones. You need to resolve the conflicts by hand and call git stash drop manually afterwards. Applying the state can fail with conflicts in this case, it is not removed from the stash list. The working directory must match the index. Pop Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of git stash save.

#Git stash command Patch#

By default, the command shows the diffstat, but it will accept any format known to git diff (e.g., git stash show -p to view the second most recent stash in patch form). Show Show the changes recorded in the stash as a diff between the stashed state and its original parent.

The command takes options applicable to the git log command to control what is shown and how. is the latest stash, is the one before, etc.), the name of the branch that was current when the stash was made, and a short description of the commit the stash was based on. List List the stashes that you currently have. You can use -no-keep-index to override this. The selected changes are then rolled back from your worktree. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. With -patch, you can interactively select hunks from in the diff between HEAD and the working tree to be stashed. By default, the git clean command will only remove untracked files that are not ignored. git clean -d -n Would remove test.o Would remove tmp/. If the -keep-index option is used, all changes already added to the index are left intact. If you ever want to see what it would do, you can run the command with the -dry-run (or -n) option, which means do a dry run and tell me what you would have removed. For quickly making a snapshot, you can omit both 'save' and, but giving only does not trigger this action to prevent a misspelled subcommand from making an unwanted stash. The part is optional and gives the description along with the stashed state. Save keep-index] Save your local modifications to a new stash, and run git reset -hard to revert them.