git-stash

Is it possible to tell whether a stash has already been applied, and therefore is no longer required, without doing git stash apply ? Assume that I'm only using one branch. This could be prevented by using pop rather than apply when applying a stash, and therefore get rid of the stash each time it gets applied. However, I sometimes use git stash to keep a snapshot of work in progress, rather than only using it to switch from one task to another. Using pop would defeat that somewhat. Just make a diff and you will see. git diff HEAD stash@{0} You can use the following shell script to get git

I generally like the use of the pager in git, but for git stash the pager annoys me. When calling git stash list , I don't want to be shown the three lines of output in the pager -- it forces me to press q just to make the output unavailable again when typing the folow-up git stash pop command. One solution would be to use git --no-pager stash list but that's to much typing (I'm lazy). Following the man page of git config , I tried git config --global pager.stash false but this doesn't seem to do what the documentation says (actually, I didn't notice any effect). Then I tried git config -

When I run the new version 2.13.0.windows.1 of its new command stash -p -- {pathspec} as git stash -p -- AB.Dir1/Dir2/DestinationHierarchyCreator.cs it reports the error error: pathspec 'AB.Dir1/Dir2/DestinationHierarchyCreator.cs' did not match any file(s) known to git. Yet when I do a git status , where I copied the file from actually , it reports Your branch is up-to-date with 'origin/project/develop'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory) modified: AB.Dir1/Dir2

I'm trying to setup a git repository with a manually defined worktree via: cd /Users/braitsch/repos/project1 git --git-dir=. --work-tree=/Users/braitsch/projects/project1 init After running the above I can add files located in "/Users/braitsch/projects/project1" via : git add somefile or git add . Commits work fine as do calls to "git branch" However, git stash list throws the following error: fatal: /usr/local/Cellar/git/1.7.4.4/libexec/git-core/git-stash cannot be used without a working tree. Is stashing not supported in user defined work-trees? git config --local core.worktree echoes out :

After adding some changes to the index with git add -p, I then issued a git stash but forgot to add --keep-index. Then I stupidly did a git stash pop, and all my changes to the index were gone. Is there a way to recover the index to the state before the git stash? When you've just done git stash pop , the last line in the output is: Dropped refs/stash@{0} (ca82a6dff817ec66f44342007202690a93763949) If you've lost it, see How to recover a dropped stash in Git? to find the commit hash. Once you have the hash, either : Drop all current changes (applied stash): git reset --hard And reapply the

Say my current branch is myfeature. I want to get master up to date. Both git merge git pull always merge into the current branch, as far as I can tell. Is there a way to merge changes from a remote branch (eg, origin/master) into a branch I'm not currently on (master)? I can think of one way: git stash git checkout master git pull origin/master git checkout myfeature git stash apply Is there a better one? (It's possibly my whole question is wrong: would git fetch automatically update master to match origin/master, if remote-tracking is enabled?) You are correct that pull/merge only merges