You don&#39;t want `git revert`. That undoes a previous commit. You want `git checkout` to get git&#39;s version of the file from master.

`git checkout -- filename.txt`

In general, when you want to perform a git operation on a single file, use `-- filename`.

----

* [git-checkout Documentation](https://git-scm.com/docs/git-checkout#git-checkout-emgitcheckoutemlttree-ishgt--ltpathspecgt82308203)
* [git-revert Documentation](https://git-scm.com/docs/git-revert)

----

**2020 Update**

Git [introduced](https://github.com/git/git/blob/ae92ac8ae3838e72840f5d019195bb9c0c9e7b0e/Documentation/RelNotes/2.23.0.txt#L61-L65) a new command `git restore` in version `2.23.0`. Therefore, if you have git version `2.23.0+`, you can simply `git restore filename.txt` - which does the same thing as `git checkout -- filename.txt`. The docs for this command do note that it is currently experimental.

* [git-restore Documentation](https://git-scm.com/docs/git-restore)

I would like to perform some tasks based on the window re-size event (on load and dynamically).

Currently I have my DOM as follows:
```html
&lt;div id=&quot;Harbour&quot;&gt;
    &lt;div id=&quot;Port&quot; (window:resize)=&quot;onResize($event)&quot; &gt;
        &lt;router-outlet&gt;&lt;/router-outlet&gt;
    &lt;/div&gt;
&lt;/div&gt;
```
The event correctly fires
```typescript
export class AppComponent {
    onResize(event) {
        console.log(event);
    }
}
```
How do I retrieve the Width and Height from this event object?

Thanks.




Angular window resize event

How does one debug their React code with React Native while the app is running in app simulator? 

How do you debug React Native?

I&#39;m trying to undo local changes to a specific file. Nothing has been committed.

When I want to revert all changes, I can perform `git revert --reset HEAD`. However, in this case, I don&#39;t want to revert all changes to all files.

Its not clear or obvious to me how to revert just a file, even after reading the `git-revert(3)` man page:

    NAME
           git-revert - Revert some existing commits
    
    SYNOPSIS
           git revert [--[no-]edit] [-n] [-m parent-number] [-s] &lt;commit&gt;...
           git revert --continue
           git revert --quit
           git revert --abort
    ...

This is similar to [How to revert a specific file in a old commit on git](https://stackoverflow.com/q/27388076), but no commits have been performed. And unlike OP, who wants to go back to an arbitrary commit, I just want the file to return to MASTER&#39;s copy of it.

Under SVN, I would just delete the file in question and then perform a `svn update`.

How do I revert changes to a single file?

How to undo local changes to a specific file

I'm trying to undo local changes to a specific file. Nothing has been committed.
When I want to revert all changes, I can perform <code>git revert --reset HEAD</code>. However, in this case, I don't want to revert all changes to all files.
Its not clear or obvious to me how to revert just a file, even after reading the <code>git-revert(3)</code> man page:
<pre><code class="hljs language-css">NAME
 git-revert - Revert some existing commits

SYNOPSIS
 git revert [--[no-]edit] [-n] [-m parent-number] [-s] &#x3C;commit>...
 git revert --continue
 git revert --quit
 git revert --abort
...
</code></pre>
This is similar to <a href="https://stackoverflow.com/q/27388076" target="_blank" rel="noopener noreferrer">How to revert a specific file in a old commit on git</a>, but no commits have been performed. And unlike OP, who wants to go back to an arbitrary commit, I just want the file to return to MASTER's copy of it.
Under SVN, I would just delete the file in question and then perform a <code>svn update</code>.
How do I revert changes to a single file?

I recently began using two-factor authentication on GitHub, and I am now unable to use git over https on private repos in the usual way:

    peter@computer:~$ git clone https://github.com/[...]/MyPrivateRepo
    Cloning into &#39;MyPrivateRepo&#39;...
    Username for &#39;https://github.com&#39;: [...]
    Password for &#39;https://[...]@github.com&#39;: 
    remote: Invalid username or password.
    fatal: Authentication failed for &#39;https://github.com/[...]/MyPrivateRepo/&#39;

If I disable two-factor authentication I can use it as before:

    peter@computer:~$ git clone https://github.com/[...]/MyPrivateRepo
    Cloning into &#39;MyPrivateRepo&#39;...
    Username for &#39;https://github.com&#39;: [...]
    Password for &#39;https://[...]@github.com&#39;: 
    remote: Counting objects: 147, done.
    remote: Total 147 (delta 0), reused 0 (delta 0), pack-reused 147
    Receiving objects: 100% (147/147), 22.70 KiB | 0 bytes/s, done.
    Resolving deltas: 100% (87/87), done.
    Checking connectivity... done.

I know I can use SSH and everything works, but is there a way I can keep two-factor authentication while still being able to use GitHub over HTTPS, for example by sending an auth token with my request?

Git Clone from GitHub over https with two-factor authentication

I&#39;m on a branch with some changes.  Changing branch is a pain as some files are locked by processes, so to change branch I&#39;d have to stop all the processes which have locks, then `stash` the changes before checking out the other branch to see its log.

Is it possible to view the log for a different branch, without having to check it out?

How can I print the log for a branch other than the current one?

I have read relevant questions about git merge and git rebase on SO, but I still cannot fully understand what is happening under the hood.

Here is our branching situation:

    MASTER------------------------
            \        \
             \        \----Feature B---
              \                        \
               \-----Feature A----------\---Feature A+B

Given 2 feature branches that stem from master at different times, we now want to combine the 2 branches. We want to follow the `first rebase then merge` practice, but when we rebase Feature A onto Feature B, we get conflicts. That&#39;s expected, because both features (and master) have changes in the same areas. But the strange thing is that the same conflict keeps reappearing after `git rebase --continue`. This drives us crazy, so we end up aborting the rebase, and use `git merge`. It turns out the conflicts are actually easy to resolve.

My question is two-fold:

 1. Is `git rebase` suitable for our situation? Or is rebase only good for pulling in a few (e.g., 1 or 2) changes?
 2. What is happening under the hood that causes the same conflict to reappear again and again? My understanding is `rebase` resolves conflicts one at a time, but which commit does it compare, and what does it compare it to?

Relavant posts on SO:

 - https://stackoverflow.com/questions/13825079/git-rebase-why-i-have-to-resolve-the-same-conflict-over-and-over
 - https://stackoverflow.com/questions/7241678/how-to-prevent-lot-of-git-conflicts-when-git-rebasing-lot-of-commits\
 - https://stackoverflow.com/questions/3516899/git-rebase-resolve-conflicts-again-and-again


Why does the same conflict reappear when I use git rebase?

I need some help. It is possible to only show one commit id? Since git log -3 show the log from 1 - 3, I just want to show only 3. What possible command will match for it?

I use the command

           git log -3 --pretty=format:&quot;%h&quot;

the result is
 
           ffbef87
           cf0e073
           1c76c5d

I only want to display the **1c76c5d** only.

            

git log show one commit id only

I want to do a `git pull` but only till a specific commit.

     A-&gt;B-&gt;C-&gt;D-&gt;E-&gt;F (Remote master HEAD)

so suppose my `local master` HEAD points to `B`, and I want to pull till `E`. What should I do ?

This is not pulling a specific commit, this is pulling upto a specific commit.

Git pull till a particular commit

Usually the command `git revert` automatically creates some commits with commit log messages stating which commits were reverted.

To avoid automatic commit there&#39;s the option `-n` (or `--no-commit`).

But after this command, the reverted files are in the staged area. I can unstage them by using the command `git reset HEAD`.

Is there a direct way to revert a commit without committing and staging?

In other words: is there a direct command to revert a commit applying the changes only to the working directory, without touching the index?

git revert --no-commit without staging

In Git, I was trying to do a `squash commit` by merging in another branch and then resetting `HEAD` to the previous place via:

    git reset origin/master

But I need to step out of this. How can I move HEAD back to the previous location?

I have the SHA-1 fragment (`23b6772`) of the commit that I need to move it to. How can I get back to this commit?


How can I move HEAD back to a previous location? (Detached head) &amp; Undo commits

I am having difficulty in doing a pull from `origin`. I keep getting:

&gt; &quot;Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details.&quot;

This also applies to switching branches. I get a similar sort of message, but this does not always happen.

I am using Visual Studio 2015 Update 1 and Visual Studio Team Services Git. On my machine I have a local `master` branch, and development branches. Every time I switch to `master` and then I do a pull I get the error message. I have resorted to doing a stash and drop stash (command line) and sometimes I use [TortoiseGit][1] to do the pull and it works.

What is strange is even if I try to revert (on the uncommitted files) using TortoiseGit it shows that it was reverted successfully (I have already tried Visual Studio undo, nothing happens). Trying to pull again, it is still the same problem. The uncommitted files will be there and sometimes when I do a `git status` it says there is nothing to commit.

Just a note: This can happen even after switching from a branch onto `master`. In this case there is no way there can be uncommitted changes, because I would not have been able to switch in the first place.

I am still new to Git, but I would like to know if there is a better way of solving this as I would like to use one environment instead of using switching between different environments for each task; it&#39;s easier for me to just do everything from Visual Studio. I have already read up on:

*https://stackoverflow.com/questions/26885057/tfs-git-in-vs-cannot-switch-to-master-because-there-are-uncommitted-changes*

**UPDATE**

It seems like this problem has to do with line endings.

By doing a `git diff -R` you can see that a line ending has been added, &quot;^M&quot;, and it is different. Removing the `* text=auto` in gitattributes (then check for changes) and putting it back on again so that the gitattributes does not signal a change of itself that needs to be committed seems to help, there will not be any changes.

  [1]: http://en.wikipedia.org/wiki/TortoiseGit


Visual Studio 2015 Git error message &quot;Cannot pull/switch because there are uncommitted changes&quot;

By mistake, I did `git add .` and `git commit` in the `develop` branch. But luckily, I did not do `git push`.

So I wanted to revert it back to original state.

I tried `git reset --soft` and `git reset HEAD --hard` but looks like I have messed it up.

How do I fix this? I want to go back to original state and possibly keep the code changes.

Content Type	Original Author	Original Content on Stackoverflow
Question	jww	View Question on Stackoverflow
Solution 1 - Git	mkasberg	View Answer on Stackoverflow

How to undo local changes to a specific file

Git Problem Overview

Git Solutions

Solution 1 - Git

How do you debug React Native?

Angular window resize event

Attributions