revert

git: better way for git revert without additional reverted commit

吃可爱长大的小学妹 提交于 2019-12-03 03:15:49
I have a commit in a remote+local branch and I want to throw that commit out of the history and put some of them into an own branch. Basically, right now I have: D---E---F---G master And I want: E---G topic / D master That should be both in my local and in the (there is only one, called origin) remote repository. Which is the cleanest way to get that? Also, there are also other people who have cloned that repo and who have checked out the master branch. If I would do such a change in the remote repo, would 'git pull' work for them to get also to the same state? If you've published then you are

Undo a git merge (hasn't been pushed yet)

折月煮酒 提交于 2019-12-03 03:01:29
问题 I just committed some changes into one of my feature branches ("feedback_tab") then, checked out "master" and merged them in there. I actually meant to merge them into my "development" branch. Now, master is ahead of 'origin/master' (its remote) by 17 commits - I haven't pushed the merge up (and don't want to, obviously). How can I revert master back to the same state as before the accidental merge? I'm confused between git revert and git reset with this stuff. I looked in my git log and

Reverting single file in SVN to a particular revision

寵の児 提交于 2019-12-03 01:33:04
问题 I have a file as shown below in an SVN repo that I would like to revert to a previous version. What is the way to do this in SVN? I want only downgrade this particular file to an older version, not the whole repo. Thanks. $ svn log myfile.py ---------------------- r179 | xx | 2010-05-10 Change 3 ---------------------- r175 | xx | 2010-05-08 Change 2 ---------------------- r174 | xx | 2010-05-04 Initial 回答1: If you just want the old file in your working copy: svn up -r 147 myfile.py If you

SVN Synchronize vs Update to Head (subclipse)

血红的双手。 提交于 2019-12-03 01:21:59
问题 I'm fairly new to both Subversion and Subclipse and am seeing some issues that lead me to believe there is a difference between updating to head, and synchronizing. Specifically I find that when I try to revert (using the subclipse history), I often get a message saying "Cannot reverse merge a range from a path's own future history, try updating first". My synchronize should ensure that I have the 'head' version of all the files in my branch on the REPO, but doing an "Update to head" does fix

vba function(button) to change a cell's value for a few milliseconds then revert [duplicate]

此生再无相见时 提交于 2019-12-02 23:20:56
问题 This question already has answers here : How to pause for specific amount of time? (Excel/VBA) (14 answers) Closed 4 years ago . Public Declare Sub Sleep Lib "kernel32" (ByVal dwMilliseconds As Long) sub changeto1quickly() range("C1").Value = 1 sleep(1) ("C1").Value= 0 End sub above works to change C1 to 1 then pause it then revert it to 0 so now I need to aggregate this across a column where the offset contains a reference I need to be able to change the value of the cells offset to the left

Why Subversion skips files which contain the @ symbol?

倾然丶 夕夏残阳落幕 提交于 2019-12-02 18:50:55
when I try to execute command like this (from a command-line or Perl script - it doesn't matter): svn revert "build\myfile@test.meta" SVN skips this file and outputs: Skipped 'build\myfile' I tried doing: svn revert "build\*.meta" But it gives the same result. I can revert these files from the GUI. And I can revert these files by doing (but it reverts more than I want): svn revert --recursive "build" Is there a workaround for this? The @ sign in filenames in Subversion actually has a special meaning - a pegged revision number. To quote the Subversion book : The perceptive reader is probably

What is the meaning of revert this commit and roll back this commit in GitHub for Windows?

依然范特西╮ 提交于 2019-12-02 17:51:59
Github for Windows features these two commands described as: revert this commit - create a new commit that reverts the changes of this commit rollback this commit - roll back this commit leaving all changes made in this and later commits in your working directory Could you explain the exact meaning of these two commands and how they can be used. Specifically I fail to understand what is the purpose of the second one. It makes no sense to me. Is it possible to revert to a previous commit check it out and if I don't like it, go back to where it was initially? This gui seems to feature a very

Is there a difference between git reset --hard HEAD and git checkout .?

狂风中的少年 提交于 2019-12-02 17:36:33
If I make changes to the working tree and have not yet committed, and I would like to revert the changes I have made, is there a difference between git reset --hard HEAD and git checkout . ? git checkout -- . will obviously only work on the current directory (and subdirectories thereof), git reset --hard will operate on the complete working tree. git checkout -- . will only update the working tree and leave already staged files as is, whereas git reset --hard will match index and working tree with the HEAD commit. when used with a refspec: reset will set the current branch head to the given

SVN/TortoiseSVN painfully slow

感情迁移 提交于 2019-12-02 16:55:48
I'm experiencing painfully slow operations with one of our SVN repositories/projects. For example, it's taking 5-10 minutes to revert the changes in one small file (10 KB). Or about 40-60 minutes to check out the project of 100 MB. There are about 30 other projects on the same server, some vastly bigger than this one, and none of them preform like this. One thing to note is that this project is a Magento project. It's not very large in terms of disk space, but I have 23k Files and 11k folders, and I have read SVN preforms badly when there are lots of little files; is this true? And is there

Undo a git merge (hasn't been pushed yet)

十年热恋 提交于 2019-12-02 16:34:25
I just committed some changes into one of my feature branches ("feedback_tab") then, checked out "master" and merged them in there. I actually meant to merge them into my "development" branch. Now, master is ahead of 'origin/master' (its remote) by 17 commits - I haven't pushed the merge up (and don't want to, obviously). How can I revert master back to the same state as before the accidental merge? I'm confused between git revert and git reset with this stuff. I looked in my git log and there's no entry for merging feedback_tab into master. I'd have thought it would be the top entry? Bit