`git rm --cached &lt;file&gt;` will completely remove the file&#39;s contents from the index. This means that on commit the file will be removed from the `HEAD` commit. (If the file was only added to the index and not yet tracked this is a &quot;no-op&quot;.)

`git reset -- &lt;file&gt;` resets the contents of the file in the index to be the same as the head commit. This means that on commit _no changes_ will be committed to the file. This operation is not valid if there is no tracked version of the file in the `HEAD` commit.

I tried to find documentation in AngularJS for supporting multiple languages with no success. Is localization supported?

Angular js support for localization

I am making a phonegap application with jquery. I am confused whether I should wrap my entire code inside JQuery&#39;s `$(document).ready()` like

    $(document).ready(function(){
        //mycode
    });

or inside the deviceready event of phonegap like

    document.addEventListener(&quot;deviceready&quot;, function(){
        //mycode
    });

I am currently using `document.ready` but I think I may encounter problems if I try to access some Phonegap API methods inside `document.ready`.

Which is the best event to wrap my code in, document.ready or deviceready?

JQuery document.ready vs Phonegap deviceready

I&#39;m trying to learn Git. I&#39;m confused between 

    git rm --cached file

and

    git reset file

both of the commands seem to take the file from staged to un-staged area. How do the commands differ?



git rm --cached file vs git reset file

I'm trying to learn Git. I'm confused between
<pre><code class="hljs language-bash">git rm --cached file
</code></pre>
and
<pre><code class="hljs language-perl">git reset file
</code></pre>
both of the commands seem to take the file from staged to un-staged area. How do the commands differ?

If I run `git stash -u`, I can stash untracked files.  However, said untracked files don&#39;t show  up at all with `git stash show stash@{0}`.  Is there any way to show untracked stashed files without applying the stash?

In git, is there a way to show untracked stashed files without applying the stash?

Say I start a git repository in a folder, and I have several subdirectories in it.

I have several globbing patterns `.gitignore` to exclude files in the subdirectories. However, when I do `git status` **before I stage anything**, git status only shows the names of the subfolders that will be added, without being specific about which files in each subdirectory will be added (staged) if I do `git add .`.  

Interestingly though, `git status` is explicit about the files that will be **committed** after I stage files with `git add .`.


Is there anyway to ask `git status` to be explicit about files for the files that would be **staged**?

git status -&gt; Show files that will be added (staged) in subdirectories

In making my favorite git log view I&#39;ve created this alias:

`graph = log --pretty=format:&#39;%Cgreen%ad%Creset %C(yellow)%h%Creset%C(yellow)%d%Creset %s %C(cyan)[%an]%Creset %Cgreen(%ar)%Creset&#39; --date=short --graph`

This creates an output like:

![Git log result with own coloring][1]

What I&#39;m missing here is the different coloring of branch types like in `log --oneline --decorate --graph`.

![Git log result with --decorate(=short)][2]

The --decorate (which uses =short by default) gives the different recognized branches a different color. The branch types `(HEAD, origin/master, origin/HEAD, master)` are colored cyan, red, red, green. Mine however are uncolored; colored only with the yellow of the whole branches part.

**Is there a way to give different colors to the different _kind_ of branches with an own alias?**


  [1]: http://i.stack.imgur.com/Rokye.png
  [2]: http://i.stack.imgur.com/nx1Lk.png

How to emulate git log --decorate&#39;s different colors per branch-type

I have JUST created a new github repo on the website. Keep in mind that I am a noob but can do basic things in terminal. Anyway, so I just created the repo on my account on github.com and didn&#39;t do a single thing to it yet.

So all I want to do is take my Xcode project **folder** and upload it to my new github repo. How do I do this via terminal?

Add Xcode project to github repo?

How can I force `git merge` to use the default merge message instead of loading my editor with said message?

I have no editor listed in `git config -l`, so I&#39;m not sure why it opens an editor.

Git merge doesn&#39;t use default merge message, opens editor with default message

I&#39;m trying to undo all changes since my last commit. I tried `git reset --hard` and `git reset --hard HEAD` after viewing [this post][1]. I responds with head is now at 18c3773... but when I look at my local source all the files are still there. What am I missing?


  [1]: https://stackoverflow.com/questions/7999259/git-how-to-perform-the-tfs-equivalent-of-undo-pending-changes

git undo all uncommitted or unsaved changes

&gt; **UPDATE&#178;**: With Git 2.23 (August 2019), there&#39;s a new command `git restore` that does this, see the [accepted answer](https://stackoverflow.com/a/15404733/946850).

&gt; **UPDATE**: This will work more intuitively as of Git 1.8.3, see [my own answer](https://stackoverflow.com/a/16589534/946850).

Imagine the following use case: I want to get rid of all changes in a specific subdirectory of my Git working tree, leaving all other subdirectories intact.

- I can do `git checkout .` , but [git checkout . adds directories excluded by sparse checkout](https://stackoverflow.com/questions/15251638/git-checkout-adds-directories-excluded-by-sparse-checkout)

- There is `git reset --hard`, but it won&#39;t let me do it for a subdirectory: 

        &gt; git reset --hard .
        fatal: Cannot do hard reset with paths.

  Again: https://stackoverflow.com/questions/11200839/why-git-cant-do-hard-soft-resets-by-path

- I can reverse-patch the current state using `git diff subdir | patch -p1 -R`, but this is a rather weird way of doing this.

What is the proper Git command for this operation?

The script below illustrates the problem. Insert the proper command below the `How to make files` comment -- the current command will restore the file `a/c/ac` which is supposed to be excluded by the sparse checkout. Note that I *do not* want to explicitly restore `a/a` and `a/b`, I only &quot;know&quot; `a` and want to restore everything below. **EDIT**: And I also don&#39;t &quot;know&quot; `b`, or which other directories reside on the same level as `a`.

    #!/bin/sh

    rm -rf repo; git init repo; cd repo
    for f in a b; do
      for g in a b c; do
        mkdir -p $f/$g
        touch $f/$g/$f$g
        git add $f/$g
        git commit -m &quot;added $f/$g&quot;
      done
    done
    git config core.sparsecheckout true
    echo a/a &gt; .git/info/sparse-checkout
    echo a/b &gt;&gt; .git/info/sparse-checkout
    echo b/a &gt;&gt; .git/info/sparse-checkout
    git read-tree -m -u HEAD
    echo &quot;After read-tree:&quot;
    find * -type f

    rm a/a/aa
    rm a/b/ab
    echo &gt;&gt; b/a/ba
    echo &quot;After modifying:&quot;
    find * -type f
    git status

    # How to make files a/* reappear without changing b and without recreating a/c?
    git checkout -- a

    echo &quot;After checkout:&quot;
    git status
    find * -type f


How to git reset --hard a subdirectory?

I did a `git pull` and got an error: 

&gt; The following working tree files would be overwritten by merge...
&gt; Please move or remove them before you can merge.

To resolve this I did the following:

    git fetch
    git reset --hard origin/master

Now when I do `git pull`, it says everything up to date. I want to know what exactly happens when I run these commands. I know `git fetch` fetches the changes from the remote repo without merging them into my local repo.

What is the meaning of `git reset --hard origin/master`? How does it work?

What is the meaning of git reset --hard origin/master?

In one of my development branches, I made some changes to my codebase. Before I was able to complete the features I was working on, I had to switch my current branch to master to demo some features. But just using a &quot;git checkout master&quot; preserved the changes I also made in my development branch, thus breaking some of the functionality in master. So what I did was commit the changes on my development branch with a commit message &quot;temporary commit&quot; and then checkout master for the demo.

Now that I&#39;m done with the demo and back to work on my development branch, I would like to remove the &quot;temporary commit&quot; that I made while still preserving the changes I made. Is that possible?

Can I delete a git commit but keep the changes?

As Git user I regular come across the situation, that I need to rework one or more commits in a way which do not fit into `--amend` or `rebase -i`with fixup commits. Typically I would do something like

    git reset HEAD~1
    # hack, fix, hack
    git commit -a
    # argh .. do I need to retype my message?
 
I take sensible composed commit messages quite serious. They typically contain larger text with references &amp; justifications for the change. Until now, I&#39;m quite annoyed on the lengthy process to recover my old commit message via an unsorted `git reflog`, `git log`and copy &amp; paste process.

Is there a better to tackle this? And how would it, if my comprises more than one commit?

_Edit:_ After a bit thinking about this I think what I&#39;m looking for is some _git stash_-like functionality for commit messages where fixup/amend commits are not appropriate.

Git: How to reuse/retain commit messages after &#39;git reset&#39;?

&gt; **Possible Duplicate:**  
&gt; [How to revert a “git rm -r .”?](https://stackoverflow.com/questions/2125710/how-to-revert-a-git-rm-r)  

&lt;!-- End of automatically inserted text --&gt;

Git SOS here. I worked 10 hours on a project without committing (I know, I know) and then I git added too many files, so I tried using git rm and accidentally deleted EVERYTHING. Is there hope for me? :(((

Git - undoing git rm

I need to exclude a folder (name uploads) from tracking. I tried to run

    git rm -r --cached wordpress/wp-content/uploads

and after that I added the path to .gitignore

    /wordpress/wp-content/uploads

but when I ran `git status` they show up as deleted. If I try to commit the changes, the files will be deleted, not only removed from tracking.

What am I doing wrong? 

I have also tried

    git update-index --assume-unchanged &lt;file&gt;

but this seems to untrack only files. But I need to remove an entire folder (including subfolders) from tracking.

Content Type	Original Author	Original Content on Stackoverflow
Question	Vihaan Verma	View Question on Stackoverflow
Solution 1 - Git	CB Bailey	View Answer on Stackoverflow

git rm --cached file vs git reset file

Git Problem Overview

Git Solutions

Solution 1 - Git

JQuery document.ready vs Phonegap deviceready

Angular js support for localization

Attributions