I have a git repository I store random things in. Mostly random scripts, text files, websites I've designed and so on. There are some large binary files I have deleted over time (generally 1-5MB), which are sitting around increasing the size of the repository, which I don't need in the revision history. Basically I want to be able to d...
Hi there, I was intending to have a play with git, and was wondering if anyone had used the git plugin for eclipse I see it's at version 0.3.1, and was wondering if anyone knew how stable it was / any gotchas? Thanks... Update: If you are using a recent version of Eclipse, your Help menu has an 'Eclipse Marketplace...' link. Ent...
I am developing some school grading software and decided to use Github to host the project. After building some code on my Ubuntu box I pushed it to Github and then cloned it down to my MacBook Pro. After editing the code on the MBP I pushed it back to Github. The next morning I tried to update my repo on the Ubuntu box with a git pull ...
I've got two branches that are fully merged together. However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would just be easier to change to the new version in the other branch, and then re-insert my one line change after bringing it over into my branch....
I had a conflict in a merge. Git creates filename.orig and filename.remote when a conflict happens. I resolved the conflict, but somehow filename.orig got added to the repository several commits ago without me noticing it until now. Is it possible to rewrite the change history such that filename.orig was never added to the repository ...
Some repository clones I have allow me to do this: % git pull % git push But other repositories require me to type: % git pull origin master % git push origin master I think I am missing something in the latter case - does anyone know what is (not) going on here? I am using the latest git version, just obviously not using it well....
Hi, I'm running into a recurrent problem with git on windows (I'm running MSysGit from package Git-1.6.0.2-preview20080923.exe, i tried as well with Git-1.5.6.1-preview20080701.exe and the results are the same). It happens very offen that some files are shown as changed when I didn't change them, and in git-gui it shows that the content...
My C# Protocol Buffers Port uses github for its source control, and I'm beginning to really enjoy using git. However, as far as I can tell, github doesn't provide any project management tools: defect and feature tracking, discussions, feature requests, docs etc. Given my affiliations, Google Code would be a natural choice, but it would s...
Ok, after seeing this post by PJ Hyett, I have decided to skip to the end and go with Git. So what I need is a beginner's practical guide to Git. "Beginner" being defined as someone who knows how to handle their compiler, understands to some level what a Makefile is, and has touched source control without understanding it very well. "...
My team works on a project in cvs containing about 20,000 Java files. Because of the number of files, it takes a while to do a cvs update. I typically keep about 5 copies of the entire tree checked out, to make it easy to check in different requests without worrying about which files were modified for each. It's a real pain to keep al...
Hi, my company started recently to use Git for source version control, and due to the incompetence of the coders - that's me and my boss :-P - we have a really nice spaghetti of files being overwritten here and there. Is there a way to mark certain files as 'untouchable' so if when updating a branch from another either do(es)n't overwrit...
% rails ... General Options: ... -c, --svn Modify files with subversion. (Note: svn must be in path) -g, --git Modify files with git. (Note: git must be in path) What do these "Modify files" options do for me? Edit: It is unclear to me what using one (or both?) of these options actually do...
Problem: edited files on windows, using git-bash, to fix IE7 problems committed, pushed to github repo booted back into linux pulled from repo merge conflict in dozens of files used 'git reset --hard' What can I do to get back on track? UPDATE: please look at the following for a clearer picture (no irony intended) (I think the ...
I'm thinking of asking my students to use git for pair programming. Because student work has to be secret, a public repo is out of the question. Instead, each student will have a private repo they maintain themselves, and they will need to exchange patches using git-format-patch. I've read the man page but I'm a little unclear which p...
How do I add a the http://github.com/technoweenie/restful-authentication/tree/master plugin to my Rails project and the commit it to the git repo ? I need it to be committed with the project. I have tried a few times but it's ignored by git. Thanks. ...
Let's say that I want to merge from a release branch to the master branch and there are some commits in the release branch that I don't want to include in the master branch. Is there a way to do the merge so that one or more of those commits will not be merged? My strategy so far is to do the following (in master): git merge --no-comm...
I have heard that uploading your website with FTP is now for n00bs, but it's the only way I've known how for the 8 or so years I've been building websites. Apparently all the buzz now is using a version control system, like SVN or Git, and somehow using SSH to upload only the files that have changed (if I understand correctly). I'm won...
When running get svn fetch to pull the latest new branches from the upstream svn repository I got this error: $ git svn fetch fatal: failed to unpack tree object 5ecb324e8b8fcb918acb253f33edc6ce49e49e0d read-tree 5ecb324e8b8fcb918acb253f33edc6ce49e49e0d: command returned error: 128 Now every attempt at git svn on that local repo resul...
Is there a command in git to see (either dumped to stdout, or in $PAGER or $EDITOR) a particular version of a particular file? ...
I want to use git to allow me to work on several features in a module I'm writing concurrently. I'm currently using SVN, with only one workspace, so I just have the workspace on my PYTHONPATH. I'm realizing this is less than ideal, so I was wondering if anyone could suggest a more 'proper' way of doing this. Let me elaborate with a hypo...