I just committed some changes into one of my feature branches (&quot;feedback_tab&quot;) then, checked out &quot;master&quot; and merged them in there.  I actually meant to merge them into my &quot;development&quot; branch.

Now, master is ahead of &#39;origin/master&#39; (its remote) by 17 commits - I haven&#39;t pushed the merge up (and don&#39;t want to, obviously).  How can I revert master back to the same state as before the accidental merge?  I&#39;m confused between `git revert` and `git reset` with this stuff.

I looked in my git log and there&#39;s no entry for merging feedback_tab into master.  I&#39;d have thought it would be the top entry?

Bit confused :/ any help welcome!  max



Undo a git merge (hasn&#39;t been pushed yet)

I have checked out a file from CVS repository and changed it.

`cvs up` command says that the file is modified `M`.

I need to delete my changes. What cvs command can do it for me?

How do I revert a modified file using CVS?

The link:

http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-howto-rollback.html 

describes two ways of rolling back an SVN directory after a wrongful commit.  What is the difference between the two options

    Revert changes from this revision
    Revert to this revision

As a test, I added a file, rolling back using &quot;Revert changes from this revision&quot; and did the same process for the &quot;Revert to this revision&quot;, and there is no difference with the state of the SVN log.

Am I missing something?

TortoiseSVN - &quot;revert changes from this revision&quot; vs &quot;revert to this revision&quot;

how do i revert all my files on my local copy back to a certain commit?


    commit 4a155e5b3b4548f5f8139b5210b9bb477fa549de
    Author: John Doe &lt;Doe.John.10@gmail.com&gt;
    Date:   Thu Jul 21 20:51:38 2011 -0500


This is the commit i&#39;d like to revert back to. any help would be a lifesaver!



git revert back to certain commit

I would like to remove all changes to my working copy.&lt;br /&gt;
Running `git status` shows files modified.&lt;br /&gt;
Nothing I do seems to remove these modifications.&lt;br /&gt;
E.g.:&lt;br /&gt;

    rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
    $ git status
    # On branch master
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
    #       modified:   Rhino.Etl.Core/Pipelines/SingleThreadedPipelineExecuter.cs
    #       modified:   Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
    #       modified:   Rhino.Etl.Tests/SingleThreadedPipelineExecuterTest.cs
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)
    
    rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
    $ git checkout -- Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
    
    rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
    $ git status
    # On branch master
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
    #       modified:   Rhino.Etl.Core/Pipelines/SingleThreadedPipelineExecuter.cs
    #       modified:   Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
    #       modified:   Rhino.Etl.Tests/SingleThreadedPipelineExecuterTest.cs
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)
    
    rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
    $ git checkout `git ls-files -m`
    
    rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
    $ git status
    # On branch master
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
    #       modified:   Rhino.Etl.Core/Pipelines/SingleThreadedPipelineExecuter.cs
    #       modified:   Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
    #       modified:   Rhino.Etl.Tests/SingleThreadedPipelineExecuterTest.cs
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)
    
    rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
    $ git reset --hard HEAD
    HEAD is now at 6c857e7 boo libraries updated to 2.0.9.2 and rhino.dsl.dll updated.
    
    rbellamy@PROMETHEUS /d/Development/rhino-etl (master)
    $ git status
    # On branch master
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   Rhino.Etl.Core/Enumerables/CachingEnumerable.cs
    #       modified:   Rhino.Etl.Core/Pipelines/SingleThreadedPipelineExecuter.cs
    #       modified:   Rhino.Etl.Tests/Rhino.Etl.Tests.csproj
    #       modified:   Rhino.Etl.Tests/SingleThreadedPipelineExecuterTest.cs
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

git status shows modifications, git checkout -- &lt;file&gt; doesn&#39;t remove them

I&#39;m using Mercurial locally for a project (it&#39;s the only repo there&#39;s no pushing/pulling to/from anywhere else).

To date it&#39;s got a linear history.  However, the current thing I&#39;m working on I&#39;ve now realized is a terrible approach and I want to go back to the version before I started it and implement it a different way.

I&#39;m a bit confused with the `branch` / `revert` / `update -C` commands in Mercurial.  Basically I want to revert to version 38 (currently on 45) and have my next commits have 38 as a parent and carry on from there.  I don&#39;t care if revisions 39-45 are lost for ever or end up in a dead-end branch of their own.

Which command / set of commands do I need?

Mercurial — revert back to old version and continue from there

I have a file as shown below in an SVN repo that I would like to revert to a previous version. What is the way to do this in SVN? I want only downgrade this particular file to an older version, not the whole repo.

Thanks.

    $ svn log myfile.py
    ----------------------
    r179 | xx | 2010-05-10

    Change 3
    ----------------------
    r175 | xx | 2010-05-08

    Change 2
    ----------------------
    r174 | xx | 2010-05-04

    Initial


Reverting single file in SVN to a particular revision

While coding I added print statements into some files to keep track of what was going on.

When I am done, is it possible to revert changes in some files, but commit the file I actually worked on? 

Say I added print in file `A`, but I modified file `B`. `B` is what I want to commit and `A`, I want to be set back to its old state.


Git undo changes in some files

I want to revert changes made by a particular commit to a given file only.

Can I use git revert command for that?

Any other simple way to do it?

Revert changes to a file in a commit

How can I revert a range of commits in git? From looking at the [gitrevisions][1] documentation, I cannot see how to specify the range I need. For example:

    A -&gt; B -&gt; C -&gt; D -&gt; E -&gt; HEAD

I want to do the equivalent of:

    git revert B-D

where the result would be:

    A -&gt; B -&gt; C -&gt; D -&gt; E -&gt; F -&gt; HEAD

where F contains the reverse of B-D inclusive.

  [1]: http://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html

Revert a range of commits in git

Is there a way to go through different commits on a file. 
Say I modified a file 5 times and I want to go back to change 2, after I already committed and pushed to a repository.

In my understanding the only way is to keep many branches, have I got that right?
If I&#39;m right I&#39;m gonna have hundreds of branches in a few days, so I&#39;m probably not understanding it really.

Could anyone clear that up please?


How can I revert a single file to a previous version?

Given a change that has been committed using `commit`, and then reverted using `revert`, what is the best way to then undo that revert?

Ideally, this should be done with a new commit, so as to not re-write history.

How do I &quot;un-revert&quot; a reverted Git commit?

After seeing the following from the command line:

    # On branch RB_3.0.10
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   index.htm

I am trying to discard my changes by typing the command:

    git checkout -- index.htm

but when I re-run git status, it looks exactly the same.  The checkout doesn&#39;t seem to be working.  Am I doing something wrong?  I am using GIT 1.6.1.2 on windows/cygwin.

    # On branch RB_3.0.10
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   index.htm

Can&#39;t seem to discard changes in Git

I have a project in which I ran `git init`.
After several commits, I did `git status` which told me everything was up to date and there were no local changes. 

Then I made several consecutive changes and realized I wanted to throw everything away and get back to my original state. Will this command do it for me?

    git reset --hard HEAD

How do I revert all local changes in Git managed project to previous state?

I know how to revert to older commits in a Git branch, but how do I revert back to a branch&#39;s state dictated by a tag? I envision something like this:

    git revert -bytag &quot;Version 1.0 Revision 1.5&quot;

Is this possible?

How do you revert to a specific tag in Git?

I managed to shoot myself in the foot this morning by doing the following:

&lt;ol&gt;
&lt;li&gt;Started working on a change to my project&lt;/li&gt;
&lt;li&gt;Made a bunch of edits to a bunch of files&lt;/li&gt;
&lt;li&gt;Realized that my approach was all wrong, and that I needed to start over&lt;/li&gt;
&lt;li&gt;cd&#39;d to the top level of my project and did a &quot;svn --recursive revert .&quot; to restore my local sandbox to its pre-changes state.&lt;/li&gt;
&lt;li&gt;Howled in horror as I realized that there had been a number of other changes outstanding in my local sandbox, and I had just obliterated all of them.  (the svn server had been down last Friday so I hadn&#39;t been able to check them in, and I had forgot about them over the weekend)&lt;/li&gt;
&lt;/ol&gt;

Fortunately in this case I had done an &quot;svn diff &gt; temp.txt&quot; before leaving work on Friday, and the temp.txt file was still on my hard drive, so I was able to feed that file into &quot;patch&quot; and recover my lost changes.

But for my future reference (i.e. the next time I make the same dumb mistake)... is there any way to tell svn to undo an &quot;svn revert&quot;?  Does svn keep a backup of the local/not-checked-in diffs anywhere?


Is there a way to recover from an accidental &quot;svn revert&quot;?

I have a repo that has two files that supposedly I changed locally.

So I&#39;m stuck with this:

    $ git status
    # On branch master
    # Changed but not updated:
    #   (use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
    #   (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
    #
    #       modified:   dir1/foo.aspx
    #       modified:   dir2/foo.aspx
    #
    no changes added to commit (use &quot;git add&quot; and/or &quot;git commit -a&quot;)

Doing `git diff` says that the entire file contents have changed, even though from eyeballing it that seems untrue (there seem to be common line ranges that diff seems to be failing to see).

Interestingly I don&#39;t remember changing these files locally. This repo is used with one remote repo (private, at GitHub.com, FWIW).

No matter what I&#39;ve tried, I can&#39;t discard these local changes. I have tried all of:

    $ git checkout -- .
    $ git checkout -f
    $ git checkout -- dir1/checkout_receipt.aspx
    $ git reset --hard HEAD
    $ git stash save --keep-index &amp;&amp; git stash drop
    $ git checkout-index -a -f

In other words I&#39;ve tried everything described in https://stackoverflow.com/questions/52704/how-do-you-discard-unstaged-changes-in-git plus more. But the 2 files remain stuck as &quot;changed but not committed&quot;.

What the heck would cause two files to be stuck like this and seemingly &quot;un-revert-table&quot;??

P.S. In the list above showing commands I&#39;d already tried, I mistakenly wrote `git revert` when I meant `git checkout`. I&#39;m sorry and thank you to those of you who answered that I should try `checkout`. I edited the question to correct it. I definitely did already try `checkout`.

Git: How to revert 2 files that are stubbornly stuck at &quot;Changed but not committed&quot;?

I messed up on my SVN repository and now need to revert the entire repository from revision 28 to 24 and don&#39;t want to deal with diffs or conflicts. Is there a quick and simple way to do this? I&#39;ve been able to revert back single files before fine with the merge command - but in this instance it wants to add all of the files back into the repository from revision 28 when all I really want to do is delete them.

I am using the command line on a linux box (bash).

Thanks


**EDIT**

Thanks for all of the help! I fixed it by:

    svnadmin create /svnroot/&lt;repo&gt;.fixed
    svnadmin dump -r 1:24 /svnroot/&lt;repo&gt; --incremental &gt; dump.svn
    svnadmin load /svnroot/&lt;repo&gt;.fixed &lt; dump.svn

Then putting the old repo in a backup location and moving the repo.fixed to repo.

Thanks again!

Roll back or revert entire svn repository to an older revision

This is not a major problem, just something I want to know whether or not is possible.

Let&#39;s say we have two commits, `abcd123` and `wxyz789`, that occur at non-adjacent, separate places, far back in a repo&#39;s history.  Now let&#39;s say we want to revert them.  Doing

    git revert abcd123 wxyz789

would result in two separate commits, one reverting `abcd123` and the other reverting ` wxyz789`.

This is all fine and well, but what if the mistakes we want to fix in the two commits are logically linked, and for the purposes of self-documentation we&#39;d like to make one single commit containing one single &quot;*I broke something so now I&#39;m reverting files x, y and z*&quot; comment?  Is there a git command that does this?

(I am of course aware that it is possible to create a commit where I just manually fix all the changes and then push.  This is painful for all the obbious reasons.)

How to revert multiple commits as part of a single commit

Basically I used [Github revert button][1] to revert a previous PR for a **feature branch** into `master`, then I decided to merge the same **feature branch** that I reverted earlier, but I was not able to do so. Steps as follow:

1. PR to merge **feature branch** to `master`
2. Revert PR merge from (`master`)
3. Tried to create new PR to merge feature branch to `master` again.
4. Got this message:

&gt; There isn&#39;t anything to compare.
&gt;
&gt; master is up to date with all commits from feature-branch. Try switching the base for your comparison.


Any suggestions on how can I merge **feature branch** again into `master`


  [1]: https://github.com/blog/1857-introducing-the-revert-button

How to PR and merge again after reverting PR using Github Revert Button

I was working with a friend on a project, and he edited a bunch of files that shouldn&#39;t have been edited. Somehow I merged his work into mine, either when I pulled it, or when I tried to just pick the specific files out that I wanted. I&#39;ve been looking and playing for a long time, trying to figure out how to remove the commits that contain the edits to those files, it seems to be a toss up between revert and rebase, and there are no straightforward examples, and the docs assume I know more than I do.

So here is a simplified version of the question:
 
Given the following scenario, how do I remove commit 2?


    $ mkdir git_revert_test &amp;&amp; cd git_revert_test
    
    $ git init
    Initialized empty Git repository in /Users/josh/deleteme/git_revert_test/.git/
    
    $ echo &quot;line 1&quot; &gt; myfile
    
    $ git add -A
    
    $ git commit -m &quot;commit 1&quot;
    [master (root-commit) 8230fa3] commit 1
     1 files changed, 1 insertions(+), 0 deletions(-)
     create mode 100644 myfile
    
    $ echo &quot;line 2&quot; &gt;&gt; myfile
    
    $ git commit -am &quot;commit 2&quot;
    [master 342f9bb] commit 2
     1 files changed, 1 insertions(+), 0 deletions(-)
    
    $ echo &quot;line 3&quot; &gt;&gt; myfile
    
    $ git commit -am &quot;commit 3&quot;
    [master 1bcb872] commit 3
     1 files changed, 1 insertions(+), 0 deletions(-)



The expected result is

    $ cat myfile
    line 1
    line 3

Here is an example of how I have been trying to revert

    $ git revert 342f9bb
    Automatic revert failed.  After resolving the conflicts,
    mark the corrected paths with &#39;git add &lt;paths&gt;&#39; or &#39;git rm &lt;paths&gt;&#39;
    and commit the result.



Remove specific commit

I&#39;ve accidentally run the command against the wrong branch in my repository - is there a way to undo this change?

Is there any way to undo the effects of &quot;git revert head&quot;?

I&#39;m experiencing painfully slow operations with one of our SVN repositories/projects.

For example, it&#39;s taking 5-10 minutes to revert the changes in one small file (10&amp;nbsp;KB). Or about 40-60 minutes to check out the project of 100&amp;nbsp;MB.

There are about 30 other projects on the same server, some vastly bigger than this one, and none of them preform like this.

One thing to note is that this project is a [Magento][1] project. It&#39;s not very large in terms of disk space, but I have 23k Files and 11k folders, and I have read SVN preforms badly when there are lots of little files; is this true? And is there anything I can do to speed things up?

  [1]: http://www.magentocommerce.com/



SVN/TortoiseSVN painfully slow

What is the easiest way to revert my working copy to a previous revision using Windows [TortoiseSVN][1]?

I did not find any &quot;findable&quot; command to do that quickly.

  [1]: http://en.wikipedia.org/wiki/TortoiseSVN


Reverting to a previous revision using TortoiseSVN

I have found various examples of how to revert an SVN commit like

    svn merge -r [current_version]:[previous_version] [repository_url]

or

    svn merge -c -[R] .

But neither of them seems to work. I tried those commands and checked the files that were changed by hand.

How do I revert a commit with revision number 1944? How do I check that the revert has been done (without looking in the actual file to the changes have been reverted)?


How do I revert an SVN commit?

I have a git tree with a lot of commits and a lot of files. Now, I want to revert specific commits that touch a file only. To explain:

    &gt; git init
    Initialized empty Git repository in /home/psankar/specific/.git/
    &gt; echo &quot;File a&quot; &gt; a
    &gt; git add a ; git commit -m &quot;File a&quot;
    [master (root-commit) 5267c21] File a
     1 file changed, 1 insertion(+)
     create mode 100644 a
    &gt; echo &quot;File b&quot; &gt; b
    &gt; git add b; git commit -m &quot;File b&quot;
    [master 7b560ae] File b
     1 file changed, 1 insertion(+)
     create mode 100644 b
    &gt; echo &quot;File c&quot; &gt; c
    &gt; git add c; git commit -m &quot;File c&quot;
    [master fd6c132] File c
     1 file changed, 1 insertion(+)
     create mode 100644 c
    &gt; echo &quot;b and c modified&quot; &gt; b ; cp b c
    &gt; git commit -a -m &quot;b and c modified&quot;
    [master 1d8b062] b and c modified
     2 files changed, 2 insertions(+), 2 deletions(-)
    &gt; echo &quot;a modified&quot; &gt; a
    &gt; git commit -a -m &quot;a modified&quot;
    [master 5b7e0cd] a modified
     1 file changed, 1 insertion(+), 1 deletion(-)
    &gt; echo &quot;c modified&quot; &gt; c
    &gt; git commit -a -m &quot;c modified&quot;
    [master b49eb8e] c modified
     1 file changed, 1 insertion(+), 1 deletion(-)
    &gt; git log --pretty=oneline c
    &gt; git log --pretty=oneline c | cat
    b49eb8e03af331bddf90342af7d076f831282bc9 c modified
    1d8b062748f23d5b75a77f120930af6610b8ff98 b and c modified
    fd6c13282ae887598d39bcd894c050878c53ccf1 File c

Now I want to revert just the two commits **b49eb8** and **1d8b06** without reverting the changes to a. IOW revert only the commits in a file (without reverting other intermediate commits (which may be thousands in number) in different files) How is this possible ?

All Revert Solutions on Gang of Coders

Total of 26 Revert Solutions

Undo a git merge (hasn't been pushed yet)

How do I revert a modified file using CVS?

TortoiseSVN - "revert changes from this revision" vs "revert to this revision"

git revert back to certain commit

git status shows modifications, git checkout -- <file> doesn't remove them