Edit: As of Git version 1.8.4, but with an important side bug fixed in Git version 2.0.1, git rebase now has –autostash. You can configure git rebase to use –autostash by default as well, with git config –global rebase.autoStash true. Please note the following sentence from the documentation: However, use with care: the final stash … Read more
git stash save accepts a single non-option argument — the stash message. git stash push accepts the message with option -m and accepts a list of files to stash as arguments.
Let’s assume your stash list looks like this: $ git stash list stash@{0}: WIP on master: Add some very important feature stash@{1}: WIP on master: Fix some silly bug First, you must remove stash entry which you want to rename: $ git stash drop stash@{1} Dropped stash@{1} (af8fdeee49a03d1b4609f294635e7f0d622e03db) Now just add it again with new … Read more
git stash show will show you the files that changed in your most recent stash. You can add the -p option to show the diff. git stash show -p If the stash you are interested in is not the most recent one, then add the name of the stash to the end of the command: … Read more
I managed to recreate your issue. It seems if you stash untracked files and then you create those files (in your example, foo.txt and bar.txt), then you have local changes to untracked files that would be overwritten when you apply git stash pop. To get around this issue, you can use the following command. This … Read more
I don’t think so (timestamp is altered, as mentioned in “GIT: Adding Local Changes to Non-Current Branch” for instance). The easiest way would be configure your IDE to refresh automatically. For Eclipse for instance, this would be the setting “Refresh on Access”. Another approach would be to keep another local repo (one where there is … Read more
You can add the files with changes you want to keep, then stash the rest of the files and clear the stash: git add file2.cpp file2.h file3.cpp git stash –keep-index At this point, you’ve stashed your unwanted changes. If you’d like to permanently get rid of them, run: git stash drop Now you have file2.cpp, … Read more
Untracked files are stored in the third parent of a stash commit. (This isn’t actually documented, but is pretty obvious from The commit which introduced the -u feature, 787513…, and the way the rest of the documentation for git-stash phrases things… or just by doing git log –graph ‘stash@{0}’) You can view just the “untracked” … Read more
According to the git-stash manpage, “A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at HEAD when the stash was created,” and git stash show -p gives us “the changes recorded in the stash as a diff between the stashed state … Read more
See the most recent stash: git stash show -p See an arbitrary stash: git stash show -p stash@{1} From the git stash manpages: By default, the command shows the diffstat, but it will accept any format known to git diff (e.g., git stash show -p stash@{1} to view the second most recent stash in patch … Read more