git-revert | 易学教程

Can not push changes after using git reset --hard

阅读更多关于 Can not push changes after using git reset --hard

问题 I had a mistake and commit some changes to git which I should not have committed. After I made the commit, I pushed my changes. I then used the following commands to try and reset my changes. git reset --hard head Now I want to push this 'reset' to the remote repository with this command: git push MyBranch But I am getting this error: remote: error: denying non-fast-forward refs/heads/branch (you should pull first) I tried to use this command without any success: git push -f "origin" Any idea

Undoing a git pull --rebase

阅读更多关于 Undoing a git pull --rebase

问题 Hey I'm new to git and I need to undo a pull, can anyone help?!? So what I've done is... git commit git stash git pull --rebase git stash pop this created a bunch of conflicts and went a bit wrong. Now doing 'git stash list' reveals that my stash is still there. Is it possible to revert my repo back to the point just after doing git commit. So effectively my repo only contains only changes I have made and nothing new from the server? 回答1: using git reflog you will see a list of commits HEAD

Revert a merge after being pushed

阅读更多关于 Revert a merge after being pushed

问题 Steps i performed: I have two branches branch1 and branch2, $git branch --Initial state $branch1 $git checkout branch2 $git pull origin branch1 --Step1 I resolve the conflicts and did a $git commit -m "Merge resolved" then $git checkout branch1 $git merge branch2 $git push origin branch1 Now i realised that while being at step1, the auto merging removed some code and the change code was pushed, now i want to go back to my initial state in order to revert any changes.looking for some immediate

How to revert last commit and remove it from history?

阅读更多关于 How to revert last commit and remove it from history?

问题 I did a commit and reverted with git revert HEAD^ just git log ➜ git:(master) git log commit 45a0b1371e4705c4f875141232d7a97351f0ed8b Author: Daniel Palacio <danpal@gmail.com> Date: Tue Jan 17 16:32:15 2012 -0800 Production explanation But if I do git log --all it still show up. I need to remove it from the history as it has sensitive information git log --all commit 5d44355080500ee6518f157c084f519da47b9391 Author: Daniel Palacio Date: Tue Jan 17 16:40:48 2012 -0800 This commit has to be

How to undo the last commit in git [duplicate]

阅读更多关于 How to undo the last commit in git [duplicate]

问题 This question already has answers here : How do I undo the most recent local commits in Git? (81 answers) Closed 3 years ago . By mistake, I did git add . and git commit in the develop branch. But luckily, I did not do git push . So I wanted to revert it back to original state. I tried git reset --soft and git reset HEAD --hard but looks like I have messed it up. How do I fix this? I want to go back to original state and possibly keep the code changes. 回答1: I think you haven't messed up yet.

How to revert uncommitted changes to files of a certain type in git

阅读更多关于 How to revert uncommitted changes to files of a certain type in git

I have a bunch of modified files in my git repository and a large number of them are xml files. How do I revert changes (reset modifications) of only the xml files? You don't need find or sed , you can use wildcards as git understands them (doesn't depend on your shell): git checkout -- "*.xml" The quotes will prevent your shell to expand the command to only files in the current directory before its execution. You can also disable shell glob expansion (with bash) : set -f git checkout -- *.xml This, of course, will irremediably erase your changes! Thank you all for your replies, but I have

Visual Studio 2015 Git error message “Cannot pull/switch because there are uncommitted changes”

阅读更多关于 Visual Studio 2015 Git error message “Cannot pull/switch because there are uncommitted changes”

I am having difficulty in doing a pull from origin . I keep getting: "Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details." This also applies to switching branches. I get a similar sort of message, but this does not always happen. I am using Visual Studio 2015 Update 1 and Visual Studio Team Services Git. On my machine I have a local master branch, and development branches. Every time I switch to master and then I do a pull I get the error message. I have resorted to doing a stash and drop stash (command line)

How to revert last commit and remove it from history?

阅读更多关于 How to revert last commit and remove it from history?

I did a commit and reverted with git revert HEAD^ just git log ➜ git:(master) git log commit 45a0b1371e4705c4f875141232d7a97351f0ed8b Author: Daniel Palacio <danpal@gmail.com> Date: Tue Jan 17 16:32:15 2012 -0800 Production explanation But if I do git log --all it still show up. I need to remove it from the history as it has sensitive information git log --all commit 5d44355080500ee6518f157c084f519da47b9391 Author: Daniel Palacio Date: Tue Jan 17 16:40:48 2012 -0800 This commit has to be reset commit 45a0b1371e4705c4f875141232d7a97351f0ed8b Author: Daniel Palacio Date: Tue Jan 17 16:32:15 2012

Can not push changes after using git reset --hard

阅读更多关于 Can not push changes after using git reset --hard

I had a mistake and commit some changes to git which I should not have committed. After I made the commit, I pushed my changes. I then used the following commands to try and reset my changes. git reset --hard head Now I want to push this 'reset' to the remote repository with this command: git push MyBranch But I am getting this error: remote: error: denying non-fast-forward refs/heads/branch (you should pull first) I tried to use this command without any success: git push -f "origin" Any idea what I can do? VonC git push -f origin myBranch should work (provided you are aware this can be

Does git revert also use the 3-way-merge?

阅读更多关于 Does git revert also use the 3-way-merge?

问题 When I run git revert , it can happen, that a conflict occurs. Does git rely on the 3-way-merge, as it is depicted in the question merge internals (cf. table below) also for revert ? What is the merge base for a revert? In What are the three files in a 3-way merge for interactive rebasing using git and meld? it is quite clear, but its hard to imagine this for a revert. A - B - C - D - C^-1 (If I want to revert C at the end.) 回答1: Yes, there is a base. (Side note: this code has changed a lot