as option -u is given, it updates worktree accordingly.git read-tree reads the given other commit (here master) into INDEX.\-B1-B2 (second, contains a:apple, b:banana, c:carrot)Ĭonfirm backing off works: git reset -hard HEAD^ Variant 1: no reference to master (very ugly) git read-tree -m -u masterĪfter: A1-A2 (master, contains a:apple, b:banana, c:carrot) I don't think I want to do a version of git revert, because in my actual repository the history on the branches is more complicated than this example and the branches may contain merges.īefore A1-A2 (master, contains a:apple, b:banana, c:carrot) I have not been able to come up with any variation of git reset that does what I want either. However, while this resets b to banana and restores c, it does not remove the file d. My question is, what git commands do I run to do this? The closest I've come up with is: git checkout master. \-B1-?-B2 (desired contents a:apple, b:banana, c:carrot) Now I'd like to add a commit to the "second" branch to make its contents match the "master" branch, that is: A1-A2 \-B1 (second, contains a:apple, b:beets, d:dandelion) Here's an example: git init test cd testĮcho apple >a echo banana >b git add a b git commit -m 'A1/a:apple b:banana'Įcho carrot >c git add c git commit -m 'A2/c:carrot'Įcho beets >b echo dandelion >d git add b d git commit -m 'B1/b:beets d:dandelion'Īt this point my history looks like this: A1-A2 (master, contains a:apple, b:banana, c:carrot)
#Git change branch and reset files how to
We can pull the fresh files from master: git checkout master - path/to/file.javaĪnd now a file is reset! And if you just want to reset part of a file, -patch should work the same way.I cannot figure out how to update a branch to be identical to another branch. Creating a whole new branch was actually just an un-necessary step. You know you need to reset a few files, but you shouldn't need to reset the whole thing. Will open up a dialog that allows you to select the parts of the changes to the file you want to keep.įor some reason, you're just enamored with your feature branch and you're unwilling or unable to give it up. I suggest getting familiar with the -patch option on git checkout: git checkout -p feat-foo - path/to/file.java Let's say you have a file with some changes, and you only want to pull in some of those changes.
#Git change branch and reset files free
Now you can feel free to delete that branch, and rename feat-foo-v2 to feat-foo.
Do this a few more times, and the old branch will be obsolete. Now you have a copy of the individual file from the old branch. While in your root git directory: git checkout feat-foo - path/to/file/to/be/used.java
But you likely still did a bunch of work that is still good, you just need to pull in those files. Git checkout -b feat-foo-v2 # make a second version of feat-foo branch When you have made dozens of commits and dozens of files changed and you need to reset git checkout master I'm going to show you how I start over on a branch in 2021: So, there's a number of legacy answers here. So in terms of clearing changes made from working on the wrong branch, stash gives you a lot of flexibility to recover from your boo-boo.Īnyhoo, if you want a reversible means of clearing changes to a branch, the foregoing is a less dangerous way in this use-case. I didn't really want to restore those changes, just wanted to validate I could get them back, so I cleared them again.Īnother option is to apply the stash to a different branch, rather than wipe the changes. First step is to find the hash of the stash I just cleared/dropped: git fsck -no-reflog | awk '/dangling commit/ 'Īfter learning the hash, I successfully restored the uncommitted changes with: git stash apply hash-of-cleared-stash Let's say I now wanted to restore those changes. All the changes made to the files in error to master were gone and parity restored. D'Oh! As my situation is hardly unique (we've all done it, haven't we ->), I'll offer a reversible way I used to discard all changes to get master looking like develop again.Īfter doing a git diff to see what files were modified and assess the scope of my error, I executed: git stashĪfter first stashing all the changes, they were next cleared. You guessed it: I started modifying a few files directly on master. I found this question after making a merge and forgetting to checkout develop immediately afterwards. REVERSIBLE Method to Discard All Changes:
0 kommentar(er)
