git selective revert local changes from a file

git version-control git-svn
Pradeep picture Pradeep · Jul 10, 2009 · Viewed 34k times · Source

In my git repo which is tracking a svn repo I have made a number of edits to a single file.

Now I want to revert those changes(like svn revert), but only portions of the file.

I want to be able to view the diffs on the file, discard(revert) the changes that I don't want and retain the changes I want.

the 

git add -i

command seems to have an option to do that but I don't want to stage this yet.

Answer

Daniel Stutzbach picture Daniel Stutzbach · Mar 4, 2010

I believe you can do it most simply with:

git checkout -p <optional filename(s)>

From the manpage:

   −p, −−patch
       Interactively select hunks in the difference between the <tree−ish>
       (or the index, if unspecified) and the working tree. The chosen
       hunks are then applied in reverse to the working tree (and if a
       <tree−ish> was specified, the index).

       This means that you can use git checkout −p to selectively discard
       edits from your current working tree.

Related questions

How do I migrate an SVN repository with history to a new Git repository?

I read the Git manual, FAQ, Git - SVN crash course, etc. and they all explain this and that, but nowhere can you find a simple instruction like: SVN repository in: svn://myserver/path/to/svn/repos Git repository in: …

Read More
How to migrate code from SVN to GIT without losing commits history?

I would like to know the recommended way to move our code from a SVN repository to a GIT repository, so that we transition our developers team & start using GIT. Can we do the transition and keep all the …

Read More
git-svn: how do I create a new svn branch via git?

I have a git repository which tracks an svn repository. I cloned it using --stdlayout. I created a new local branch via git checkout -b foobar Now I want this branch to end up in …/branches/foobar in the svn …

Read More