If you haven&#39;t committed, you should just be able to `git stash` again, possibly with a `git reset HEAD` first.

Also, `git stash apply` doesn&#39;t delete the stash like `git stash pop` does. So if you have committed, you could `git reset --hard [last_good_commit]` (if you haven&#39;t pushed) or `git revert [last_good_commit]` (if you have pushed) and just apply the stash again once you&#39;re on the right branch.

**Note**: Running `git reset --hard` will delete any uncommitted code.

When using flags in Java, I have seen two main approaches. One uses int values and a line of if-else statements. The other is to use enums and case-switch statements.

I was wondering if there was a difference in terms of memory usage and speed between using enums vs ints for flags?

Java: Enum vs. Int

I&#39;m trying to make an Android 4.0 emulator. I&#39;ve tried this process on a fairly fast computer in both Linux and Windows(Phenom II X6 w/ 8G of RAM) and every time I get &quot;unfortunately, launcher has stopped&quot; when I try to look at the menu of the launcher. 

![enter image description here][1]

I have tried having the RAM size all the way up to 1024M, but nothing seems to help it. Is this just a borked emulator or what? 


  [1]: http://i.stack.imgur.com/X3zkY.png

Android 4.0 emulator always has a crashing Launcher?

I regret having applied a stash (wrong branch). How can I undo this and have my stash back to my stash list in order to apply it later on the right branch?

Aborting `git stash apply`

<p>I regret having applied a stash (wrong branch). How can I undo this and have my stash back to my stash list in order to apply it later on the right branch?</p>


What is the difference between `origin` and `upstream` on [GitHub][1]?

When a `git branch -a` command is executed, some branches it displays have a prefix of `origin` (`remotes/origin/..`) while others have a prefix of `upstream` (`remotes/upstream/..`).

  [1]: http://en.wikipedia.org/wiki/GitHub


What is the difference between origin and upstream on GitHub?

I get this error when I try to change branch.

Probably I will give some information of the commands at 

    /path/to/git/repo/.

upon command:

    git branch

I get following output

    * V1.5
      V2.0
      master

And when I try the command 

    git checkout V2.0

I get following output:

    fatal: This operation must be run in a work tree

config file contents:


    cat config 
    [core]
            repositoryformatversion = 0
            filemode = true
            bare = true
    [remote &quot;origin&quot;]
            url = /path/to/git/repo/.git

fatal: This operation must be run in a work tree

I understand the scenario presented in Pro Git about [The Perils of Rebasing][1]. The author basically tells you how to avoid duplicated commits:

&gt; Do not rebase commits that you have pushed to a public repository.

I am going to tell you my particular situation because I think it does not exactly fit the Pro Git scenario and I still end up with duplicated commits.

Let&#39;s say I have two remote branches with their local counterparts:

    origin/master    origin/dev
    |                |
    master           dev

All four branches contains the same commits and I am going to start development in `dev`:

    origin/master : C1 C2 C3 C4
    master        : C1 C2 C3 C4
    
    origin/dev    : C1 C2 C3 C4
    dev           : C1 C2 C3 C4

After a couple of commits I push the changes to `origin/dev`:

    origin/master : C1 C2 C3 C4
    master        : C1 C2 C3 C4
    
    origin/dev    : C1 C2 C3 C4 C5 C6  # (2) git push
    dev           : C1 C2 C3 C4 C5 C6  # (1) git checkout dev, git commit

I have to go back to `master` to make a quick fix:

    origin/master : C1 C2 C3 C4 C7  # (2) git push
    master        : C1 C2 C3 C4 C7  # (1) git checkout master, git commit
    
    origin/dev    : C1 C2 C3 C4 C5 C6
    dev           : C1 C2 C3 C4 C5 C6

And back to `dev` I rebase the changes to include the quick fix in my actual development:

    origin/master : C1 C2 C3 C4 C7
    master        : C1 C2 C3 C4 C7
    
    origin/dev    : C1 C2 C3 C4 C5 C6
    dev           : C1 C2 C3 C4 C7 C5&#39; C6&#39;  # git checkout dev, git rebase master

If I display the history of commits with GitX/gitk I notice that `origin/dev` now contains two identical commits `C5&#39;` and `C6&#39;` which are different to Git. Now if I push the changes to `origin/dev` this is the result:

    origin/master : C1 C2 C3 C4 C7
    master        : C1 C2 C3 C4 C7
    
    origin/dev    : C1 C2 C3 C4 C5 C6 C7 C5&#39; C6&#39;  # git push
    dev           : C1 C2 C3 C4 C7 C5&#39; C6&#39;

Maybe I don&#39;t fully understand the explanation in Pro Git, so I would like to know two things:

 1. Why does Git duplicate these commits while rebasing? Is there a particular reason to do that instead of just applying `C5` and `C6` after `C7`?
 2. How can I avoid that? Would it be wise to do it?

  [1]: https://git-scm.com/book/en/v2/Git-Branching-Rebasing#_rebase_peril

Git commits are duplicated in the same branch after doing a rebase

When I do &#39;git commit&#39;, I&#39;m getting the following:

`fatal: Unable to create &#39;project_path/.git/index.lock&#39;: File exists.`

However, when I do &lt;code&gt;ls project_path/.git/index.lock&lt;/code&gt; it&#39;s saying the file doesn&#39;t exist. Any thoughts on what I should do? I&#39;ve also noticed that project_path/.git is owned by root, not sure if that has anything to do with the problem I&#39;m encountering.

git version is 1.7.5.4

edit: It seems that the problem most likely was another process I had running, that was writing (unbeknownst to me) to the project directory. I restarted my machine and then I had no problem committing.

git index.lock File exists when I try to commit, but cannot delete the file

&gt; **Possible Duplicate:**  
&gt; [git - removing a file from source control (but not from the source)](https://stackoverflow.com/questions/936249/git-removing-a-file-from-source-control-but-not-from-the-source)  

&lt;!-- End of automatically inserted text --&gt;

I have a `.classpath` file which is currently in GIT repository.

After I pulled from remove repository(`git pull origin master`). How can I remove this file from GIT control, I mean `NOT to delete` this file from my computer **but** remove it from GIT version control. (Because this file is not needed for version control).

**P.S.**

I tried `git rm &lt;path-to&gt;/.classpath` , but then my whole project complains about wrong class path, why git rm delete my file instead of remove from version control ???

remove a file from GIT control

I have a Git alias that expands to:

    git log --graph --oneline --all --decorate

According to `man git log` there are a couple of suspicious options: `--not` and `--branches`; but I can&#39;t make it work properly.

How should I edit that to hide the stashes?

---

**FYI**: as per the [accepted question][1] and [comment][2] my `.gitconfig` alias now looks like this:

    [alias]
        l = log --branches --remotes --tags --graph --oneline --decorate --notes HEAD


[1]: https://stackoverflow.com/a/9438578/477168
[2]: https://stackoverflow.com/questions/9437182/git-show-all-branches-but-not-stashes-in-log#comment46034208_9438578

Git show all branches (but not stashes) in log

I can&#39;t pop my stash because I merged a branch which apparently conflicts with my stash and now my stash is seemingly unable to be popped.

    app.coffee: needs merge
    unable to refresh index

Anyone know how to resolve this?

**FIXED!**

Turns out the actual issue was an unresolved merge conflict from the merge, **NOT** that the stash would cause a merge conflict.

Resolution: Commit the conflicted file.

Git stash pop- needs merge, unable to refresh index

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&#39;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&#39;s possibly my whole question is wrong: would `git fetch` automatically update master to match origin/master, if remote-tracking is enabled?)

How to pull into not-the-current-branch?

I cannot apply stash back to the working directory.

**Little story:**

First I tried to push some committed changes, but it said: &quot;no you can&#39;t, pull first&quot;... OK then, I&#39;ll pull things from GitHub and then push my changes. When I tried to pull, it said that I had changes that would be overwritten, and that I should stash my changes. OK, I stashed the changes... did the pull, and push the committed changes. But now, I cannot restore the uncommitted changes I was working on.

*This is the error:*

    MyPath/File.cs already exists, no checkout
    Could not restore untracked files from stash

For sure I don&#39;t yet understand all the concepts of git, they confuse me a bit... maybe I did something wrong.

It would be great if someone could help me solve this... I&#39;ve been searching google and everything for more than an hour now, and I didn&#39;t come to a solution yet.

Help is much appreciated. Thanks!

Why can&#39;t stash be applied to the working directory?

I see [here](http://git-scm.com/book/en/Git-Tools-Stashing) you can apply/unapply a stash and even create a new branch off of a stash. Is it possible to simply see what is inside the stash without actually applying it?

Content Type	Original Author	Original Content on Stackoverflow
Question	abernier	View Question on Stackoverflow
Solution 1 - Git	Brandan	View Answer on Stackoverflow

Aborting `git stash apply`

Git Problem Overview

Git Solutions

Solution 1 - Git

Android 4.0 emulator always has a crashing Launcher?

Java: Enum vs. Int

Attributions