One way to achieve this is through git reset. While on branch B execute git reset –hard A Thereafter, branch B points to the head-commit of A. The –hard option resets the index and working tree so that all tracked files are reset to the version in branch A. The old HEAD commit-ID of A … Read more
According to https://discuss.atom.io/t/auto-reload-changed-files/8451/6, FileWatcher is an Atom package which will do what you want.
This answer is mostly quoted from my answer to a previous question: git reset in plain english. The two are very different. They result in the same state for your index and work tree, but the resulting history and current branch aren’t the same. Suppose your history looks like this, with the master branch currently … Read more
In $ git reflog you should find some of your commits. Once you find the latest commit that you want to move to you should reset back to your commit id $ git reset _Your_Hash_ , as $ git reset –soft just reset the files and not the index or working tree.
git branch tmp # mark the current commit with a tmp branch git reset –hard Commit1 # revert to Commit1 The SO answer “What’s the difference between ‘git reset’ and ‘git checkout’ in git?” is quite instructive for that kind of operation A git reset –hard HEAD~2 would do the same thing (without needing to … Read more
In order to do it locally, you can do the following commands to go to master and move it to the old commit. git checkout master git reset –hard <old_commit_id> If you then want to push it to the remote, you need to use the -f option. git push -f origin master
git rm –cached <file> will completely remove the file’s contents from the index. This means that on commit the file will be removed from the HEAD commit. (If the file was only added to the index and not yet tracked this is a “no-op”.) git reset — <file> resets the contents of the file in … Read more
Getting back in synch after a pushed rebase is really not that complicated in most cases. git checkout foo git branch old-foo origin/foo # BEFORE fetching!! git fetch git rebase –onto origin/foo old-foo foo git branch -D old-foo Ie. first you set up a bookmark for where the remote branch originally was, then you use … Read more
Rebase or revert are the options. Rebase will actually remove the commit from the history so it will look like that second commit never existed. This will be a problem if you’ve pushed the master branch out to any other repos. If you try to push after a rebase in this case, git will give … Read more
git reset does know five “modes”: soft, mixed, hard, merge and keep. I will start with the first three, since these are the modes you’ll usually encounter. After that you’ll find a nice little a bonus, so stay tuned. Let’s assume you have a repository with a history akin to this: 7e05a95 (HEAD -> main) … Read more