In magit you just have to go on the hunk or file you want to revert, and use `k` to discard a modification. See the relevant documentation at [https://magit.vc/manual/1.4/magit/Staging-and-Committing.html](https://magit.vc/manual/1.4/magit/Staging-and-Committing.html) for more detail.


With the file open, you can `M-x magit-file-checkout`.

I have a column like this: 

What devices will you be using? 

    iPad
    Kindle &amp; iPad
    No Tablet
    iPad
    iPad &amp; Windows

How do I count the amount of people that said iPad?

This formula does work for exact matches but not if it contains an additional value: 

    =(COUNTIF(A2:A51,&quot;=iPad&quot;)/COUNTA(A2:A51))*1


Any Suggestions?



Google Spreadsheet, Count IF contains a string

In Xcode, there&#39;s a feature to edit variables or codes within a scope:

![Scope editing][1]

In my IDE, this feature only works when I move my mouse over a variable. Most of the time, I don’t get this feature. Since it’s fairly useful, I’d like to use it more often.

Is there a keyboard shortcut for this? (Please don’t tell me to use “Find and replace”.)

  [1]: http://i.stack.imgur.com/VOZ2f.png

What’s the shortcut for “Edit All in Scope” in Xcode?

*The question is about Magit major mode for Emacs function and less so about how to do this via command line interface.*

I only have a local Git repository. How would I restore a selected file to its previous version? I believe that the Git command for this must be something like `git checkout HEAD^ path/to/file` but I may be wrong here too, just guessing really.

What I&#39;m looking for is essentially the same thing as &lt;kbd&gt;C-x v u&lt;/kbd&gt; in `vc-dir` buffer.

Essentially, what I was hoping to do was:

* delete the modified file.

* pull from local repo.

But **Magit** doesn&#39;t seem to be able to do that, it seems to prefer to just delete the file, instead of restoring it.

Magit revert single file

The question is about Magit major mode for Emacs function and less so about how to do this via command line interface.
I only have a local Git repository. How would I restore a selected file to its previous version? I believe that the Git command for this must be something like <code>git checkout HEAD^ path/to/file</code> but I may be wrong here too, just guessing really.
What I'm looking for is essentially the same thing as <kbd>C-x v u</kbd> in <code>vc-dir</code> buffer.
Essentially, what I was hoping to do was:
<ul>
<li>
delete the modified file.
</li>
<li>
pull from local repo.
</li>
</ul>
But Magit doesn't seem to be able to do that, it seems to prefer to just delete the file, instead of restoring it.

When I try to apply a patch from a file, I see

&lt;pre&gt;
error: cannot apply binary patch to &#39;my/resource.png&#39; without full index line
error: my/resource.png: patch does not apply
&lt;/pre&gt;

I added `my/resource.png` in the commit from which I made the patch. How can I enabled full-index support?

git cannot apply binary patch *** without full index line

I am looking for a git hosting environment for several users. Therefore i&#39;ve searched for comparisons between **Gitolite**, **Gitlab** and **Gitorius**. But i get nothing what could be useful.

Is there anybody, who has experiences with different hosting tools and could provide an advice? 

Which is the best git hosting sw? - Gitolite vs. Gitlab vs. Gitorius

Ok so I an contributing to a project on github. The project on github is `upstream`, my forked repo on github is `origin`, and my `local` repo on my computer.

    git checkout -b feature
    # Working on feature
    git commit -a -m &#39;only commit on feature&#39;

then I submit a pull request 

    git push origin master

The pull request is reviewed and a unrelated change needs to be made. Someone else makes a commit and merge into `upstream/master`

Now I am asked by the `upstream` maintainer to **&quot;rebase my pull request on top of master&quot;**

This is my story (insert Law and Order sound effect).....

I did not make any changes to the pull request and its still the same commit on branch feature. 

    git checkout master
    git fetch upstream
    git checkout feature
    git rebase master
    =&gt; &quot;Current branch feature is up to date.&quot;
    git push origin feature
    =&gt; &quot;Everything up-to-date&quot;

I don&#39;t understand. How is this possible when I know that someone committed and merged to `upstream/master` after I pushed my pull request to `origin/feature`?

Can anyone tell me what the correct procedure should be in this situation?
    

Contributing to project on github, how to &quot;rebase my pull request on top of master&quot;

I have run the following command to ignore watching/tracking a particular directory/file:

    git update-index --assume-unchanged &lt;file&gt;

How can I undo this, so that `&lt;file&gt;` is watched/tracked again?

Undo git update-index --assume-unchanged &lt;file&gt;

Is there such a thing as `git pull --dry-run` to see how stuff will be merged before it messes up my working tree?

Right now I am doing:

    git fetch origin &amp;&amp; git merge --no-commit --no-ff

I did not see anything in the man page for &#39;git-pull&#39; related to it.

To clarify, I just need it in an Ant script for deployment to see if there are conflicts when doing `git pull`, then back off exit out of build, fail deployment and leave that directory tree the same it was before `git pull`.


Is there a &quot;git pull --dry-run&quot; option in Git?

Say I&#39;ve made a number of unrelated changes to uncoupled files in my git repo. I want to review and commit each of the files separately.

I run `magit-status`, and get a list of changed files. But the only magit diff commands I can find (`d` and `D`) diff entire revisons, not individual files.

I want the output of `git diff &lt;filename&gt;`, but in the magit diff buffer. How can I get magit to diff only one file? 

How can I diff a single file with magit?

I have a question about Emacs Lisp. What is the difference between **setq** and **setq-default**?

Tutorials say **setq** takes effect in the *local buffer* while **setq-default** affects all buffers.  
 
For example, if I wrote **(setq a-var a-vars-value)** in **init.el**, I found after starting Emacs and opening a new buffer, the **a-var** is also there and its value is **a-vars-value**. I thought it was not supposed to be there. It seems there is no difference between **setq** and **setq-default**.  

Is there something wrong with my understanding?

For example:  

1. I wrote **(setq hello 123)** in the **init.el** file, and I run **emacs abuffer** in the shell, then I input **&quot;hello C-x C-e&quot;**, it shows &quot;123&quot;. The same happens when I run this in all new buffers.  

2. I wrote **(setq tab-width 4)** in the **init.el** file. When I run **tab-width C-x C-e**, it shows &quot;8&quot; (Current mode is &#39;Text&#39;). However, when I use **(setq-default tab-width 4)**, it show &quot;4&quot;. I can&#39;t explain this phenomenon.

The difference between setq and setq-default in Emacs Lisp

I&#39;m using Emacs 24; I&#39;ve installed the **zenburn** theme, which is great, except I cannot see the selection highlight easily with the highlight color provided by **zenburn**:

![enter image description here][1]

By **&quot;selection&quot;** color, I mean the color of text that I&#39;ve selected by setting a mark (`C-space` and moving the cursor to select text).

For the life of me, I cannot figure out how to change it. I&#39;ve tried changing every combination of `highlight`, `selection`, etc.. that I can think of in `zenburn-theme.el`, but nothing seems to change it.  

**For sanity&#39;s sake, I&#39;ve tried changing other colors in the theme to make sure Emacs is loading the file properly - it is - those changes work.*

I would have especially thought that changing `highlight` would work, but no customizations to the `highlight` line seem to work:

    ;;;; Built-in                                                                                                                                                                            
    ;;;;; basic coloring                                                 
       ...                                                                                                      
       `(highlight ((t (:background ,zenburn-bg-05 :foreground ,zenburn-yellow))))  

How can I change the selection color?

  [1]: http://i.stack.imgur.com/pZwnZ.png

How do I change the highlight color for selected text with Emacs / deftheme?

I understand that Mac has some Emacs keybindings enabled by default (e.g. &lt;kbd&gt;Ctrl&lt;/kbd&gt;+&lt;kbd&gt;A&lt;/kbd&gt; move to beginning of line etc.). If I open TextEdit for example I can navigate like in Emacs.

But when I try &lt;kbd&gt;Alt&lt;/kbd&gt;+&lt;kbd&gt;F&lt;/kbd&gt; or &lt;kbd&gt;Alt&lt;/kbd&gt;+&lt;kbd&gt;b&lt;/kbd&gt; for move to next word or last word it does not work. It prints out `ƒ` and `∫` instead.

Is there a way to jump words instead?

I think that I did not tinker with the keybindings and I use the US layout on a german keyboard.

Is there a way to make alt-f and alt-b jump word forward and backward instead of printing ƒ and ∫ on Mac?

I want to create a new file in dired mode. Is there &quot;create new file&quot; command in dired mode ?  For example, When I type &quot;c&quot; in dired mode, it creates &quot;untitled.txt&quot;. It&#39;s very simple , but I can&#39;t find it.

Content Type	Original Author	Original Content on Stackoverflow
Question	user797257	View Question on Stackoverflow
Solution 1 - Git	Rémi	View Answer on Stackoverflow
Solution 2 - Git	Razzi Abuissa	View Answer on Stackoverflow

Magit revert single file

Git Problem Overview

Git Solutions

Solution 1 - Git

Solution 2 - Git

What’s the shortcut for “Edit All in Scope” in Xcode?

Google Spreadsheet, Count IF contains a string

Attributions