What is the simplest way to undo a particular commit that is: not in the head or HEAD Has been pushed to the remote. Because it is not the latest commit, git reset HEAD doesn't work. And because it has been pushed to a remote, git rebase -i and git rebase --onto will cause some problem in the remotes. More so, I don't wan...
i have created a .gitignore file inn the same folder that the with the .git folder. but i still get the files i'm trying to ignore when doing a rescan of the repository. this is the content of the file. # Ignored files *.suo *.user bin obj *.pdb *.cache *_svn *.svn *.suo *.user *.build-res TestResults _ReSharper* what am ...
Since asking my last question which turned out to be about rebasing with GIT, I have decided that I don't want to rebase at all. Instead I want to: Branch Work work work, checking in and pushing at all times Throw out all of those commits and pretend they never happened (so one clean commit at the end of work) I do this currently by ...
I'm working on a django project with a few other developers and we have recently realized that all the .pwc files in our app cause the commits and repository to be cluttered. Is there any way I can remove all .pwc files from all child directories in my git repository and then ignore them for any future commit? ...
Git noob here. I know this is against the principal of "distributed source control" but I want to "password protect" certain development branches in my GIT repository. That is, I don't want that branch to be available via git branch -r, except to a certain group of developers who need access to that branch, via some sort of password. ...
I've seen many people use git (or SVN) for deploying their web app projects, be they PHP, Python or whatever. Essentially, you use pull the code from the stable branch to your local server and possible run a few migration updates. Easy. But I wondered if anyone uses git for deploying to cloud server / clusters. RightScale suggest that w...
Ok.. I have looked through this site and just can't seem to find the answer I am looking for. We have a multi server setup for our web sites, typically (DEV/QA/PRODUCTION). Our sites are .net which require some sort of build before being deployed. We are using SVN for source control and are looking for a tool/website/something that will...
Hi, I have a workspace which may has multiple TAGs on a signle commit ID For example commit #3 <--- TAG1 / TAG2/ TAG3 | commit #2 <--- TAG4/ TAG5 | commit #1 <--- TAG6/ TAG7 When I checked on commit-1 , I want to know the info of there are two TAGs (TAG 6/ TAG7) on current commit , but I can not find correct way to do that . I ha...
Exposition: I do not git commit all that often; only after a lot of work. I occasionally do stupid things, like 'rm -f blah.hpp' when I mean 'rm -f blah.cpp' I use zsh I would like to set something up in my zsh precmd to do a "git add */; git commit -a -m 'auto log ...'" Now, here's the issue: alot of these commits are spurious. At...
Hi! I have a big project written in Delphi and I want to manage it's sources using Git. I created Git repository, which includes my application's sources and 3rd party components. All that stuff is automatically building using msbuild. The biggest problem is RES files. Some of them are updated every time I rebuild my application, some ...
Hi everybody. I have the following project setup: Solution A Project 1 (a lightweight component) Project 2 (contains a lot of files and depends on Project 1) Solution A is a single git repository. Then I created another solution and found that I could reuse and even update the functionality of Project 1. So my second solution would...
Hello all, I'm a bit lost, one of my developer co-worker is doing a drupal website, that is doing special pages, custom logos, custom hierarchy etc. His work is scattered in database tables (it looks like CCK create tables), database rows (texts, image links etc.), static files (pictures, PDFs ...) and maybe some PHP (custom module). M...
I accidentally commited log/test.log but have never pushed it. I have since done a git rm to get rid of it. But when I try to push, I'm still getting a huge amount of data attempting to be transferred. Shouldn't the git rm fix that problem. If not, how could I fix it? ...
I created a topic branch from the master; made some commits. Then checked out the master; rebased it on the svn and merged the topic branch. There were no commits on the master itself, so the merge was fast-forward. Now, when I try to svn dcommit it gives me merge conflicts! wtf? Clearly there is a linear history on the master. The w...
Yea, right. I use git (with git-svn) on linux and a colleague uses svn on windows. So many times, git reports whitespace issues. In fact it fails to commit a linear history because of these problems and creates merge conflicts. What is the simplest way to configure svn/git and git-svn on windows and linux so that there are now whitesp...
Hello all, I'm fighting against the tool and loosing. I want my project for every text file and every developer to be UTF-8 and CRLF. 1) how do I configure git for that ? 2) how do I share this git setting with all developers so that nobody can forget to configure that ? I read a bit about core.autocrlf and safecrlf, but I don't see ...
I'm setting up git on my new Windows 7 machine and I'm hitting a roadblock when it comes to getting github to acknowledge my ssh key. I am doing things a little different from the standard script in that I would rather not use cygwin and prefer to use my powershell prompt. The following is what I did: I installed msysgit (portable). I...
I use git to maintain multiple working copies of my code. The idea is that I can check out any branch, build and run it to see how the branch's feature x fits in with the current state of the code. Git's master branch is the Trunk and the other git branches are features or things I would like to try out. Therefore, my typical usage is ...
I'm encountering a weird issue with .gitignore on Windows. I want git to ignore all .exe files, except those in the Dependencies folder (and all subfolders). So I have: .gitignore: *.exe !/Dependencies/**/*.exe This, unfortunately, does not work. Meanwhile, this does: *.exe !/Dependencies/folder/subfolder/*.exe So I'm won...
Hi all, I'm trying to script a 'git pull' at $dir. It should be the equivilent of 'svn update $dir'. Does any one know any easy way to do this? ...