You can do this, if the remote repository accepts forced pushes: git push –force origin clean_start:master Note that if anyone else has the repository cloned, a push from them could potentially undo this. If you want to merge your local master branch and the remote master branch, but keep the file tree from your branch … Read more
The cat command can be used to retrieve any revision of a file: $ hg cat -r 10 myfile.pls You can redirect the output to another file with $ hg cat -r 10 myfile.pls > old.pls or by using the –output flag. If you need to do this for several files, then take a look … Read more
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 wondering at this point whether the peg revision syntax causes problems for working copy paths or URLs that actually have at signs in them. After all, how does … Read more
Your feature branch will still point to your work. You will not lose those changes. As plaes said, you can reset master back one with git reset –hard HEAD^ If you want to grab some specific files from your branch without merging, you can check them out: git checkout yourbranch — file1 file2 etc If … Read more
This seems like a bug in msysgit indeed. As a workaround, try creating a .gitattributes file containing * -text This will tell git not to perform EOL conversions on any files.
You basically have two options to revert changes: create a new commit which applies reverse changes. This is the preferred option as it doesn’t changes history on a public repository Remove the commits and force push them. The first option can be achieved by using git revert git-revert – Revert some existing commits Given one … Read more
Suppose you have a single file in your repo, and you have the following commits: commit 1 : the file contains A commit 2 : the file contains B commit 3 : the file contains C If you execute revert on commit 3, you’ll have this in the repo: commit 1 : the file contains … Read more
Like vcsjones says, the solution here is git checkout: git checkout <refspec> — path/to/directory # or path/to/file where <refspec> can, for instance, be HEAD, that is, the current working commit. Note that this usage of the checkout command will affect the working tree but not the index. git revert is used to “revert a commit”, … Read more
You are trying to revert a merge commit, and git doesn’t know which parent to revert to. The -m allows us to choose which parent to choose. See the merge commit and note down which parent you want to go to. The parent information can be seen in git log, for example: commit d02ee0f2179def10277f30c71c5d6f59ded3c595 Merge: … Read more
How about git revert -n? -n –no-commit Usually the command automatically creates some commits with commit log messages stating which commits were reverted. This flag applies the changes necessary to revert the named commits to your working tree and the index, but does not make the commits. In addition, when this option is used, your … Read more