Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated.
Be warned that if you use reset, you will no longer see in your log the commit(s) after the commit you reset to.
If you want to preserve in your log the commit that deleted the files, you can Checkout the commit before the delete into a new branch, copy the restored files into a separate folder, switch back to your original branch, then add the files back to your original branch.
I checked out a project copy 8 months ago, made lots of changes there.
Now, I'd like to take all the new changes for the last 8 months.
The amount of changes is overwhelming (tens of thousands of commits).
What I'd like to do is to take changes of 1 month at a time, merge with my version, test.If I pull latest the amount of changes/conflicts is overwhelming. I guess it's clear what I'm trying to do, but I have no clue how to do it with GIT (I'm more familiar with svn). All my local changes I committed to local branch, what do i need to do to pull changes made since I checked out, but not all of them? I don't know if splitting it up is going to end up being less work in the long run, though.If you merge it all in one chunk, you're not really merging 10,000 commits, you're merging the I agree about extra work, but when I rebase to latest I get overwhelmed with amount of conflicts and I simply loose track of where of where I am and have to restart eventually from scratch.Doing it gradually is not that painful :) I'm see tomorrow if I got it all right I didn't understand half of what you wrote.I don't use git at all and I don't use git command line at all at all ;) It's the project that I need to merge changes from uses git.I checked it out once 8 months ago and never used git since then.