* `git stash pop` will bring the top entry of the stash's stack into your Index and Working Directory, deleting that entry from the stash * `git stash` will implicitly perform a `git stash push` and putting your current Index and Working Directory's state onto the stash's stack * `git checkout ` won't let you switch branches if the target branch modifies files that are currently already modified * This is particularly useful if you need to jump around different branches while you have some modified files hanging about that would be changed by the other branches * `git stash` allows you to save the state of your Index _and Working Directory_ into the "stash" (acts like a stack) and rolls you back to a clean Working Directory * _If you force the remote branch to take on your rewritten history, people who have previously pulled to their local repositories will no longer have coherent histories_ * _Be wary if you have rewritten commits that have already made it to a remote branch that other people access_ * _Child commits will techincally become new commits_
![origin 8 stash bars origin 8 stash bars](https://i.stack.imgur.com/WyLoP.png)
* Adding a file to a commit turns it into a _new_ commit * A reworded commit is technically a _new_ commit * A commit's hash depends on the files' data, the commit message, commit info, _and the parent_ * `rebase` and `commit -amend` _rewrite_ commits if you make changes * Playing back commits on top of another branch (more on this later) * This allows you to put multiple minor commits into a single more substantial one * `` is either a commit hash or branch that you want to replay commits _onto_ * `git rebase -i ` is the form you most likely will use * `git rebase` is an incredible powerful command that allows you to rewrite history * `git commit -amend` with no staged files will just have you edit the commit message * `git commit -amend -no-edit` won't ask you to edit the commit message * If you forgot to _delete_ a file, just `git rm ` to remove and stage the removal, the `git commit -amend` * `git commit -amend` will bring the currently staged changes into the current commit and allow you to edit the commit message * `-hard`: undoes the commit and brings the Working Directory to the state of the commit, discarding the changes * `-mixed`: default, undoes the commit, leaves the Working Directory untouched, and leaves the changed files _unstaged_ * `-soft`: undoes the commit, leaves the Working Directory untouched, and leaves the changed files _staged_ * `git reset` has three major modes in this application: * We could provide the commit's hash or some reference/pointer to a commit instead (e.g. * `HEAD~1` specifies that we want the HEAD to take on the state of the commit that is 1 before the HEAD * `git reset` sets the HEAD to a specified state (bringing the current branch along for the ride) * `git reset HEAD~1` is a common internet answer given without explanation # Scenario: made a commit by accident and want to "uncommit"
![origin 8 stash bars origin 8 stash bars](https://live.staticflickr.com/7413/9458865250_fb4e4ffbaa_b.jpg)
* _If you force the remote branch to take on the rewritten history, it'll cause the other peoples' local branches to be incoherent_ * _Use with caution if you have already pushed them to a branch that's shared with other people_ * _This section involves changing up commit history_ For general questions concerning these items, please contact our customer service at 80.# "Boy I sure do love creating a merge commit every time I pull!" Manufacturers adjust their labeling regularly and are solely responsible for the accuracy of the information.
![origin 8 stash bars origin 8 stash bars](https://www.sefiles.net/images/library/small/origin8-rave-handlebar-348146-1.jpg)
Whether you’re stocking up for the holidays or stocking up for your own private chocolate stash, this bag of yummy 3 Musketeers is just the right size! Filled with fun-sized 3 Musketeers candy bars and a positive message on each wrapper, this bag has smaller versions of the popular chocolate bar complete with the whipped chocolate filling.