I've got the opposite problem from "How do I make git ignore mode changes (chmod)?" I've got a file that I've changed executable permission on, but there are also some text changes, and I want to commit the former but not the latter. Is this possible with git? (Actually, I've made some text changes I want to commit along with the execut...
Hi, I did a 'git commit' but I have not pushed to others. so when i do 'git status', I get '# Your branch is ahead of 'master' by 1 commit.' So if I want to roll back my top commit, can I just do" git reset --hard eb27bf26dd18c5a34e0e82b929e0d74cfcaab316 given that when i do 'git log' commit eb27bf26dd18c5a34e0e82b929e0d74cfcaab3...
I've seen this command floating around on various sites. git checkout --track -b <...> If I create a bare repo on a remote server and work from two different location. What's the quickest and "approved" way of doing so? What I did was, I created the initial repo on my laptop and then pushed the changes to the "origin" where my VPS rep...
Flashbake is introduced by Cory Doctorow and discussed here and its project page is here. It hides most of the complexity of git and allows simple configuration. I'm looking for something for Perforce since I have 10s of GB growing to 100+ GB in the next year of a few MB files (pictures mainly) which might not be ideal for git. I also...
Ok, I'm starting to get the hang of things. When previewing changes to a repo prior to pulling from it, why doesn't it show the changes I've made in my clone repo if I do the following? git fetch git log HEAD..origin Please see this thread on how my workflow is setup. http://stackoverflow.com/questions/1613812/git-difference-between-...
I'm just getting started with git and I have a question. My app has 10 other developers working on it, each one having their own branch like dev_XXXXX. So if I do a clone of the repository, do all of their code gets copied to my machine? In that case I dont want that. Suppose my branch is dev_swamy, how do I then clone just the stable br...
I cloned a git repository and then tried to roll it back to a particular changeset early on in the development process. Everything that was added to the repository after that point is unimportant to me so I want to omit all subsequent changes from my local source code. However, when I try to roll back in the GUI tool it doesn't update m...
I'm trying to clone parts of a github project but I can only get the root folder. This is the first time im trying to use github and I just installed tortoisegit, im used to svn and cvs where you could just take a folder you wanted to checkout, but it seems git only got a .git file in the root folder so im not sure what to do. ...
In git, for a given commit X, X^ means the commit prior to X. Is there an hg equivalent? ...
Here is my situation. I keep a set of files on both my laptop, and a server. I already have a sync setup between the two locations using rsync. Recently I decided that a certain part of these files should be under source control. I am using git for this. So I have shared/ which I sync using rsync. Then I have shared/stuff/ which is unde...
I've installed gitosis using the instructions on the main site (http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way). Searching the net it seems pretty standard install method. However I seem to be getting the following error when trying to clone gitosis-admin. git clone [email protected]:gitosis-admin.git ...
I have a 20-year-old project that I would like to migrate from RCS to git, without losing the history. All web pages suggest that the One True Path is through CVS. But after an hour of Googling and trying different scripts, I have yet to find anything that successfully converts my RCS project tree to CVS. I'm hoping the good people at...
It's possible that I'm not really understanding how git works here, but I have a "master" git branch, and then I created a new branch called "refresh." I switched to the "refresh" branch, made a ton of changes, file additions, etc, and then switched back to the "master" branch to make some other changes to that branch. When I did a 'gi...
I have a laptop and a desktop, for which I'm trying to learn to use git to manage my work against a perforce repository. I'm using git-p4 successfully on the desktop, and can use it successfully on the laptop as well, in isolation. However, one of the things I'd like to be able to do is to "pull" or "push" changes from the laptop to de...
Is there any way of easily deciphering (i.e. at a glance) whether or not a branch has already previously been merged with the another branch or the trunk? The nearest I've been able to figure out is by looking at the commit notes and displaying the merged commit notes. The disadvantage with this seems to be that unless you know which b...
I recently configured Hudson to build a Grails project using Git as the repository. However, I am getting this error when running the build: Compilation error: srcdir "/home/matthew/.hudson/jobs/qotd-idea/workspace/src/groovy" does not exist This is because src/groovy is not copied into the Hudson workspace, so Hudson can't find the ...
I'd like to get a local GIT repository in sync with both a remote GIT and an SVN repository. The steps I'm executing are the following: > git push Everything up-to-date > git pull Already up-to-date. Alright, my remote GIT repos seems to be fine so far. > git svn rebase First, rewinding head to replay your work on top of it... Apply...
When I do a git pull my repository automatically pulls from the original git repo that I cloned from. How can I get the URL of that git repository from the child repository? ...
How can I install Git on Eclipse? I found tutorials on http://cho.hapgoods.com/wordpress/?p=159 but there was said that "You should then see the eight Eclipse projects 'org.spearce.something.'" I don't see those eight projects. ...
Suppose I have this feature branch "foo". Now I want to merge it back into master, but I've added some debugging code that I don't want in master. The debug code is in it's own commit, so I could use git cherry-pick on each commit and leave out this commit. But that's gonna be quite tiresome. Is there some "inverse cherry-pick" that ...