I'm trying to display some git version information (via grit) in my rails application footer for debuging. When I want to see the head, it's straightforward: @git_repository = Grit::Repo.new( Ter::Application.root ) head = @git_repository.heads.first t '.git_info', :revision => head.commit.id, :branch => head.name, :author => head.commi...
I'm trying to get hudson setup on a Debian server to build a rails project, and its constantly falling over at the first hurdle. I get the following sequence of messages everytime I try to run a build: Started by user anonymous Checkout:workspace / /var/lib/hudson/jobs/myproject/workspace - hudson.remoting.LocalChannel@2d61100c Using s...
I have made several commits on different files, but so far I would like to push to my remote repository only a specific commit. Is that possible? Thanks ...
Hi all, Im looking to have GIT as the primary source control for my employer (250 people) company. Before proceeding further I would like to have answers to the following questions. (1)Does GIT have any specific max file size limit that it can handle, if yes please provide the numbers. (2) What is the max repository size recommended by...
Is there something like "git show tags"? ...
After I do git pull, I want to see the revisions I just fetched in gitk. How can I do this? I know I can see what revisions to use in the output of git pull and I can give them as a parameter to gitk, but I want to do this automatically. (Actually, I don't need to see all the fetched revisions, those from the current branch are sufficie...
Say I get a patch created with git format-patch. The file is basically a unified diff with some metadata. If I open the file in Vim, I can see which lines have been modified, but I cannot see which characters in the changed lines differ. Does anyone know a way (in Vim, or some other free software that runs on Ubuntu) to visualize per-cha...
I've got a diff e-mail sending using Git's post-receive e-mail hook (thanks to this SO post) but the e-mail that it sends is just plain text. I'd like something a big more colorful and well formatted. Is there a script or something I can run using the post-receive hook that will send a nicely formatted diff e-mail instead of the plain t...
I'm wondering, how could I avoid a commit in really small changes of code. For instance, sometimes I miss a space between parameters or that kind of tiny code formatting. The reason I ask this is because later I have to push my commits to a remote repository and I don't want to include those small changes. Any ideas? Thanks ...
Hi there, I saw the post "How do I tell git to always select my local version for conflicted merges on a specific file?", which says if you have conflict on a folder, we need to add .gitattributes to that folder and then add a merge driver to config file to say always keep my branch's content for this folder. And this works perfectly fi...
I'm trying to setup my (Zend Framework) development environment (or more importantly my directory structure) with git. However, my underlying question really has nothing to do with the specific libraries involved but more importantly how to get git to accomplish what I am wanting. I'm going to have my project root be /home/jsuggs/proje...
I have a Ruby on Rails application that I am trying to host on Heroku. I would also like to use a GitHub public (free) repository to track changes. I need to check-in a file containing passwords to the Heroku remote repo, but ignore the file so I don't check it in to GitHub. Is there a way I can add the file to one repo, and ignore it fr...
So I'm trying to break a few rules quietly. GoDaddy doesn't seem too keen on letting me have Git, and for some reason think that one needs root access to run any gcc (crazy web-hosting support teams). As I try to convince them to do what I tell them to, I'm trying to find a gcc that I can send to my server so I can build git on my own an...
I am gettting the following error while trying to commit to a local repository: error: insufficient permission for adding an object to repository database .git/objects I created another repository to compare the permissions of .git and .git/objects and everything works fine in the new repository, and the permissions are the same (drwxr...
Hi, I am working on an ecommerce site, based on django-lfs, and I am finding that I need to make a number of changes to the django-lfs core files... i.e. adding additional properties to models, updating views, adding url patterns etc. I started out placing django-lfs in my pythons site-packages path with the view that if i needed to mak...
I'm trying to "portablize" git, so I want to send the required executables from the make process of git to my hosted web server. Can I do that? Do you think the executables will work? ...
I have checked out a svn repository using git svn. Now I need to checkout one of the branches and track it. Which is the best way to do it? ...
I have a git repo and am having trouble reverting a merge. The current hash is 0ce2ca0b35f59af267241cf4d40d16a3e13ba6f3. and it has two parents: df1acf5f54426d30f12c6b4558c3dd922297aae3 e19b912404ffd3c153ccac3072dbf22396896d2a doing the following will revert to df1acf5f54426d30f12c6b4558c3dd922297aae3 git revert -m 1 0ce2ca0b35f59af2...
OK, total noob question, for msysgit on Windows 7, but I have a remote repository (on unfuddle), create on one PC, and now I want to pull it down to another PC. I tried 'Fetch' using Git Gui, but the folder still only has a .git subfolder. It took a while pulling it down, so I assume there is something in the repo, but how do I check ...
I had a lot of local changes. I just accidentally did git merge another_branch git reset --hard HEAD^ on a lot of work. :( with the intention I didn't want the merged changes in here. How do I recover the original state? No, the local changes were never committed/stashed. No way? ...