github-for-windows

I'm using Github Desktop (previously called GitHub for Windows ) and I made a bunch of changes to my local files. It became such a mess that I decided I just want to rollback my local files to where they were the last time I made a commit. I haven't committed the new changes - I just want to get rid of them. How can I do this? Mark Cramer When you open GitHub for Windows v2.0 (ancestor of GitHub Desktop ) and select your repository in the leftmost column, you'll see all your previous commits in the 2nd column from the left. If you select one of those commits, in the right column at the top you

I am trying to push files to my remote repository from my local repository and I see this fatal error : fatal: unable to access ' https://github.com/vinivasundharan/abcd.git/ ': Couldn't resolve host 'github.com' My computer is not using any Proxy because I have seen methods to resolve the issue when Proxy is being used. I have tried the solutions from this and this . But both doesn't seem to help. My system has an active internet connection using Windows 7. UPDATE git config -l returns the following. I had to post it because I do not what exaclty this means core.symlinks=false core.autocrlf

I am trying to configure DiffMerge as my difftool in Git but having no luck. This is the revelent section of my .gitconfig file (the other settings not shown are just for the user). [diff] tool = diffmerge [difftool "diffmerge"] cmd = \"C:\\Program Files\\SourceGear\\Common\\DiffMerge\\sgdm.exe\" \"$LOCAL\" \"$REMOTE\" Whenever I call git difftool from the powershell command line the conflicts are shown directly beneath in the powershell interface, not in diffmerge as intended. I know the settings are being picked up by git because when I inspect the global config I am given the settings from

I'm want to be able to work on my git projects using both the Github for Windows application as well as git in the command line using Cygwin (on Windows). But I keep on getting problems with the line endings when I switch from one to the other. If with the command line tool the repo has no changes, it will want to modify all the files with the Github app. If I do the changes with the Github app it will then again want to change it with the command line tool. After a fair amount of testing I couldn't make it work for both tools. What would make it work? In the .gitatributes I currently have set