Hi, here is my scenario: 1) I cloned Helma-ng git repo 2) I created my helma-ng/myproj folder and its git repo How to update Helma-ng git repo without messing up myproj inner git repo? How to work using Helma-ng latest commit? hamen ...
While helping a friend with a git problem today, I had to introduce a branch that needed to be totally separate from the master branch. The contents of this branch really had a different origin from what had been developed on the master branch, but they were going to be merged into the master branch at a later time. I remembered from re...
I'd like to roll my own server so I can have my projects available 24/7 but with more flexibility than one of the free providers like github can provide. Anyone have a good hosting service that includes shell access? I've been searching on google, but I get a weird spammy vibe from a lot of the places. ...
I installed Msys Git and TortoiseGIT x64. Whenever I try to use the Get Clone command I am getting the error: "Msys Git Install Path Error". The wierd thing is that I when I set it all up, it worked once and then stopped. Now I have uninstalled and reinstalled both programs multiple times and I can not get it to work again. If this...
We use branches to do our work and keep trunk pristine for the most part. Before merging my changes from my branch into trunk, I want to make sure that I've got the latest changes from svn/trunk into my local branch. It's taken me a bit to figure it out but here's the workflow I've come up with, and I'd like to know if there's a better w...
Hi all I am trying to run git from a different directory than I am in. So for example if I am in: cd /home/domain/ git status << runs perfect ie # On branch master # Your branch is ahead of 'origin/master' by 6 commits. So now I want to run this command from a different directory using the --git-dir option. So lets say I'm in root/ ...
I'm using TortoiseGit with msysGit installed with the msysGit-fullinstall-1.6.4-preview20090729.exe and it works in a very strange way: on the About windows it says it can't find git, even if all the operations seems to complete ok on the Settings window, General tab, MSysGit section, the version is blank even with the correct path set...
Hi, I've already tried hg2git through fast-export and I've already tried hg-git. Both with no success. hg2git actually worked, but I had to ask a friend who runs a Unix machine to do it. And that messed up all the linefeeds throughout the files. hg-git simply failed with some libzip compression error. Has anyone had any success conv...
i have commits that are in a remote repository (origin/master) which i want to put in a branch created from that repository (origin/remote_branch). when i checkout to that remote branch git checkout -b mybranch origin/remote_branch then cherry-picked the commits that i made git cherry-pick 9df63616b0428cf6edc4261adb533a1ac516b9a0 ...
The problem is a simple one. I've used git cvsimport to import a cvs repo into a remote branch in a local git repository. I then wish to sync this repository: branches, tags, and all, to a git repository in the cloud (github / gitorious). To do this I don't have the access to rsync or copy the repository directly, I have to use git push...
(Editing the question :) I have 2 repository in github, These repositories are http://github.com/abc.git and http://github.com/xyz.git. Now the repository "abc.git" was the main repo for the project. After about a month of development we found we could do better by making re-useable code. So we decided to create a new repo for a - reus...
I started some work on a new feature. After coding for a bit I decided this feature should be on its own branch. How do I move the existing uncommitted changes to a new branch and reset my current one? I want to be sure that I can reset my current branch while preserving work on the uncompleted feature. ...
When I try to create a new branch tracking a remote branch, I get this: che@nok ~/prj/git-ipc $ git branch -t test main/some_remote_branch error: Not tracking: ambiguous information for ref refs/remotes/main/some_remote_branch The source seems to somehow search for branches to track and throws me out because it finds less more than on...
I've deleted a file with Git and then committed, so the file is no longer in my working copy. I want to look at the contents of that file, but not actually restore it. How can I do this? ...
I have a project in git with a bunch of graphics (.jpg, .png, .tiff, etc). The graphics extensions are in my .gitignore (this can change) because I do not need to version the graphics (the department responsible for graphics has version cue and tracks their own changes to the graphics). However, when I push, it seems only the tracked con...
A common scenario when I develop is that the codebase will have several config files which require machine specific settings. These files will be checked into Git and other developers will always accidentally check them back in and break someone else's configuration. A simple solution to this would be to just not check them in to Git, o...
I am using the eclipse plugin for Git on Mac OS 10.6, and I cannot figure out how to compare two version of a file. I can pull up the file's history, and see all of the commits, with their messages, but I can't figure out how to see what changed in each commit. This was very easy with subversion, and I'm sure its easy with Git, if you ...
This question probably is based on my lack of understanding of the role of .gits and git repositories in general but: Can I rsync a dir with content that I created with git init between machines ? I have a repository on my laptop, and the only way to get it away from there is scp/rsync to a remote host, from which I can download it aga...
I started work on what I thought would be a minor bug fix on my master branch. However, it has spiraled out of control to the point where I wish I had created a separate branch to do the development in the first place. So right now what I'd like to do is: Create a new branch called (say) "edge" Move all the changed / untracked files o...
What is the best way for git to consume less disk space? I'm using git-gc on my repositories but I would like suggestions if there is any other command to shrink the disk space used by git. Thanks ...