I have a new project starting up, and I was planning to use git as the version control mechanism to learn it a bit better. Since it's a two-person project, the fully-distributed model of pushing your changes to your public repository and asking the other guy to pull from it and vice versa is a bit overkill. So, I'd prefer a single share...
In my development environment at home I want to install msysgit im my local machine and in a server that I have. The goal is to develop in my local machine and then pushing it to the server (remote repository), for the nightly builds. Unfortunately, I can't seem to config the server's msysgit installation to be a remote repository. How...
Is there any way to get the contents of a single file from a remote git repository? "git archive" looks promising, except that GitHub has it explicitly disabled. The following StackOverflow question generally had the right idea: http://stackoverflow.com/questions/1125476/git-retrieve-a-single-file-from-a-repository In our situation, w...
I'm trying to nail down a good system for release management, combined with the tagging practice of tagging with version numbers - for example, 1.0. Any changes after that tag will be incremented, like 1.0-1, 1.0-2, etc. However, if I create a new branch from master for 1.0 release, and then I switch to that branch and tag it 1.0, the s...
I'm trying to run git for my local repository and use SVN for my central repository to a CodePlex project. I downloaded the most recent version of msysgit, but the SVN support doesn't appear to be working. The following successfully initializes a new empty repository and then gets stuck: git svn init https://myproject.svn.codeplex.com ...
Assuming I am the maintainer of a repo, and I want to pull in changes from a contributor, there are a few possible workflows: I cherry-pick each commit from the remote (in order). In this case git records the commit as unrelated to the remote branch. I merge the branch, pulling in all changes, and adding a new "conflict" commit (if nee...
This is primarily a question about effective Git usage. I should first say I'm not an expert in Rails (at least in a production sense) and definitely a Git newbie, however, I have had some experience using SVN. My problem is that I am trying to create a rails application but do not know the best way to keep development local on my comp...
hello, in my scenario i maintain a svn-synchronized git repository on a server. all developers in my group use this repository to get their updates. i couldn't find a way to trigger an automatic "git svn fetch" (or any other command) before a developer fetches the latest changes. my current workaround is to have a cron job that syncs in ...
I'm trying to update my repo from a remote branch and keep getting this error when I do a "git pull". I haven't made any local changes, and even if I have I don't need to keep them. I've tried: git reset --hard and I get the same problem The only thing that seems to work is deleting the offending file and try a git pull again. I've ...
I did git clone git://foo.git cd foo ...edit files.. now I want to start fresh. I don't care about any changes I already made, but I don't want to clone the whole giant foo.git again, just lose all my changes. how can i git clone git://foo.git a second time, without getting fatal: destination path 'foo' already exists and is not ...
I want to ignore all files in my repository except those that occur in the 'bin' subdirectory. I tried adding the following to my .gitignore * !bin/* This does not have the desired effect, however: I created a new file inside of bin/, but doing 'git status' still "shows nothing to commit (working directory clean)" Any suggestions? T...
I'm trying to get started using git and tortoise-git. Is there a way to hide files that should never be tracked completely? Currently, all temporary build files are in the same "Not Versioned" list as new files when I commit a change. ...
I am installing msysgit 1.6.4 beta on my Win Vista development VPC. An install screen is requesting whether I want to use Unix line termination or DOS line termination. Ordinarily, I'd choose DOS, but the setup text indicates that DOS termination may mean files do not work with all of Git's command line tools. The Unix line terminatio...
When I do a merge conflict resolution with Kdiff3 (and other merge tool I tried) I noticed that on resolution a *.orig file is created. Is there a way for it to not create that extra file? ...
What is the best way to create a local backup of a git repository hosted on github? I have the following needs: The local backup should be a bare repo The backup should include all branches It should be easy to (incrementally) update the backup Basically, I want a perfect mirror, with the possibility to update easily. As such, the ...
I've been looking over this post, but still can't figure out how to solve my particular issue. I'm using git-svn locally against a svn repository. I usually do the following: git svn rebase (to get the latest from the repo). git checkout local-dev git merge master (to merge this into my local branch) make changes, committing locally ...
At my place of work we are currently looking for a documentation system for writing manuals and other customer and internal documentation. Its features should be: Small templating possibilities, since sometimes a customer name must be inserted somewhere, but the text stays the same. Reusability of text parts, since some parts might be ...
Given multiple unpushed git commits, is it possible to git-svn dcommit only one of those commits? e.g. I have commit foo, bar, and baz, but right now I only want to have bar end up in the svn repo. Is this possible? ...
I recently had occasion to add a dependency on a Git-hosted project to a Subversion-hosted one. After adding support for an ad-hoc "git:externals" property to the parent project's packaging script to manage this dependency, it occurred to me that someone may have found such a property handy before and that it would be awfully nice if th...
For some reason, when I initially did a pull from the repository for a git project of mine. I got a ton of files in my working copy that have no discernible changes made to them, but keep showing up in my unstaged changes area. I'm using Git Gui on Windows xp, and when I go to look at the file to see what has changed. All I see is ......