I'm working on a repository I forked in which the author took the dirty path and stuffed all his dependencies in the lib/ directory in the initial commit. Normally, if it wasn't the initial commit, I would just do an interactive rebase and delete the entire commit (if that's all he did). However, I have no idea how I would edit/delete th...
I have succeeded in getting git to start Beyond Compare 3 as a diff tool however, when I do a diff, the file I am comparing against is not being loaded. Only the latest version of the file is loaded and nothing else, so there is nothing in the right pane of Beyond Compare. I am running git 1.6.3.1 with Cygwin with Beyond Compare 3. I ...
I'm trying to find the best way to do distributed development (2-person team) on Google App Engine. Are we able to use git or mercurial on GAE? If not, does that mean we need another server to host our source code (and then deploy from that server)? Note: I'm a GAE noob. ...
I want to extract a copy of the latest version of a file held in a git repository, and pass it into a script for some processing. With svn or hg, I just use the "cat" command: Print the specified files as they were at the given revision. If no revision is given, the parent of the working directory is used, or tip if no revision ...
I am looking for some advice on how to use git for a website with a lot of html content. We have 2 content managers that do basic html coding and upload their work to the server. I am the only developer. The site is pretty equally divided between 2 types of content. First is a news content that is posted to a database and displayed thr...
My goal is to use ClearCase (7.0.1+) on Fedora (12+, 64bit) in a company where most of the developers are blissfully using the standard CC/Windows development environment. My most recent experience is with git on Fedora 12 and I find that to be a very comfortable and productive programming environment. Two solutions to this problem spri...
here is the situation. I have some local files, I pull from remote branch and there are conflicts. I know that I would like to keep my local files. Is there a command I can use to in effect say "mark all conflicts as resolved, use local" ...
What's the current state of Git support in Eclipse? The EGit downloads page looks empty. I'd like to give Git a try for a new project, but I need to know how well it works with Eclipse right now. If it's likely to cause huge pain I'd rather stick with Subversion. Anybody out there happily using Git and Eclipse? Anybody who tried it rec...
New to git, so this is hopefully a simple question with a simple answer. I forked a repository on GitHub. I then cloned it on my local machine by using the public repo URL: [email protected]:samuelclay/django-mingus.git, as opposed to the private repo URL: git://github.com/samuelclay/django-mingus.git. I made some changes to the code, com...
We have the following scenario: We have several base versions of our game OpenLieroX; right now 0.57, 0.58 and 0.59. For each base version, we have a seperate branch. Each such base version has several releases (like 0.57 beta1-beta8 and rc1, 0.58 beta1-beta9). When we are working on new stuff, we are working in the highest base version...
I have create a repository on my laptop, how can I clone the repository in my laptop to my desktop? I have already created a shared folder where my repository is located. Thanks in advance. ...
After quite a few hours playing with rebase, the repo still looks different from what I need: I would like to accomplish the following tasks [some of which were OK before I started messing with rebase :( ] Move The top commit ("Removed extraneous...") to before the branch off (Right above "fix for #226"). Combine the two commits that...
I have 2 branches in Git, namely master and dev . I'd like to convert dev branch's content into master, that is to say I wanna ditch the state of dev, and change it to how it is like in master, how can I do that? Thanks! ...
I'm new to Git, but familiar with SVN. As a test I made a repository in a local directory with git init. Then I cloned the empty repository (over SSH using 127.0.0.1, which is another thing I wanted to test) to another local directory. I added some files in repository 2, I did git add * and finally git commit -a -m "First source code". ...
We are using git-shell to ensure that the git account is only used for git operations. This works great. However before we move to using git full time, how do we set it up similar to github whereby depending on your public key you may only commit to your own repositories? As far as I can tell the github people may be rolling their own ...
Instead of running "svn diff", "hg diff" and so on .. can we write a single command that calls svn/hg/git accordingly? Can the diff output be made pretty? edit: command-line tools (not GUI) preferred. ...
I've got an Xcode project under git and I've got a "experimental" branch off of my "master" branch. Both branches have diverged since the branch (so no fast-forwarding!), and I am merging "experimental" into my "master" branch. I've setup a .gitattributes file to treat a particular Xcode file (project.pbxproj) as binary, as it should be...
What does git update-server-info do? How do I know if I need it? The manual says: A dumb server that does not do on-the-fly pack generations must have some auxiliary information files in $GIT_DIR/info and $GIT_OBJECT_DIRECTORY/info directories to help clients discover what references and packs the server has. This command generates ...
Although I love the git history rewrite feature, how does one go about ensuring history isn't rewritten. We dont mind what a programmer does on their own machine, but we need to ensure that a version is not pushed to the server that changes history. ie We need to guarantee that a particular version from the past really was that versio...
I would like to create a backup of a git repository that I use for tracking a svn repository (with git-svn). Can I use git push --mirror for that purpose or would I lose any git-svn related information when I needed to restore the backup? ...