I've got a file with the following changes: # Manual hunk edit mode -- see bottom for a quick guide @@ -280,6 +281,7 @@ if( foo ) { bla(); - test( true ); + removeThis(); + test( false ); } else How can I commit the change for test() only, and avoid committing removeThis() ? Each time I try to edit the hunk manually ...
I'm new to version control and I have a question regarding branching. I have the following branches - "dev" and "master" Say I add or modify a file in dev, I run "git status" and it shows what I've changed. Now, if I switch to the "master" branch, I also see the pending changes when running "git status." Is that supposed to be correct? ...
I just recently got around to converting an old svn project to git. Everything has worked fine except for one part of the history import. For some reason the Commit number is way off. For example the first commit to the subversion repo was 1; but if I check the git log it reads that same commit as 53267272343. Just a little off :) Does...
Hi, I'm on mac os X (new to it) and need to generate a public rsa key for use with git (think I got that right). I'm following the directions here: http://help.beanstalkapp.com/faqs/git/generating-and-adding-ssh-keys-on-mac-os-x and have generated the key named (id_rsa.pub) in my home directory, but I don't see it there when I do ls, ...
I had to revert to a previous commit by running: git revert <HASH> So I go push the changes back into my remote repo and it failed with: ! [rejected] ci_172 -> ci_172 (non-fast-forward) To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. ...
Hello everyone! I've configure a git server. I need to use ssh because I've defined permissions using users of my domain, using LDAP. Only users with permissions could read a project. So, the links to access my repositories are like that: ssh://[email protected]@hostname/var/git/repo.git When I clone, commit or push a project using linux...
I was to setup an SSH Server to Host my Git Repository to my local area network. I followed this tutorial by TimDavis hoping that I would be able to make a secured Git Repository. I tested my connection using Putty and it was successful. My only problem was I cannot run "git" command in the console. Then I tried cloning my repository, a...
I made a bunch of commits to the master and realized after the fact that they should have been in a branch. I've looked at various things about rebasing and merging and resetting the master. But no attempts at manipulation have yielded a history that looks like what I'm trying to do. My attempts lead me to believe it requires some comb...
Here's the deal: A Github repo features a historical import from CVS, divided in tags of previous releases. I would like to locally build the various releases to document the UI changes (need screenshots for a writeup). So there is absolutely no need for tracking / further development on the tagged release. I just want the specific f...
So I've got a local repository with two branches: master and shop. I've also got a bare repository, and a remote repository. I can push and pull fine between all of these, but there are some files that keep getting lost. I'm doing the following: From my local root: git push barereposerver shop All is well. Whoo, we pushed there. And ...
Hi I have a local repo and have pulled from several remotes. I am finding that I have about 15 files which are modified. Some of them have come from a remote and others I think, though I am not sure, may have been modified prior to pulling from a remote, but never committed (or else they were modified and committed locally but then have...
Currently i use http://www.codaset.com/ for private repo. It's free but it can't free forever. Codaset is nice git repo and we can write blog , wiki in there. I want to use private repo for my private project. Not commercial nor big project. I also found www.projectlocker.com/ but user interface is so poor. So, I want to use like codaset...
Hi all, I'm learning how to deploy RoR (v2.3.4) on Heroku. Last night was my first attempt at pushing an app with an external gem (active_merchant). What is the URL format for configuring the .gems file? (My last attempt was 'active_merchant --source github.com/Shopify/active_merchant'.) Any inputs would be great. Thanks. -BrianP. (b...
I have a repositories, i want to have two "views": Developers can see the whole thing and customers should only see certain (tagged, or marked in another way) branches. I thought about making two repsoitories A and B and than list all not needed files as "ignored files" in B but I am not sure whether this will work. (I don't know whethe...
I use git with a big development team and I'd like to have a set of aliases be common across every developer. They change every so often, so I'd like to store them in origin somehow. Is there any way to set that up in git? I'm using gitosis for the git server (not sure if that would make a difference). ...
How can I list tags contained by a given branch, the opposite of: git tag --contains <commit> Which "only list tags which contain the specified commit". If something like this does not exist, how do I test whether a commit is contained by another commit so that I can script this? I could do this: commit=$(git rev-parse $branch) for...
Apologies if this has already been asked. I spent quite a long time looking through old SO posts on Git but have not yet found one that really matches this case. I'm on a team of 5 developers using Git on a project. We have been using it without any real issues for about a year now. We have Gitosis set up on a shared server and do mo...
I have some code that I want to put into an svn repository for a client after doing some work on it in git, is there any way to initialize a svn repository using a git repository's history? I have initialized git repositories from svn repositories, and regularly commit between existing svn and git repositories, but I don't know how to...
I want to add an external directory to an existing repository. External Dir: /home/some/directory Working Dir: /htdocs/.git If I attempt the following command from the /htdocs dir: git add /home/some/directory I get an error: fatal: '/home/some/directory' is outside repository ...
I use git for personal projects and think it's great. It's fast, flexible, powerful, and works great for remote development. But now it's mandated at work and, frankly, we're having problems. Out of the box, git doesn't seem to work well for centralized development in a large (20+ developer) organization with developers of varying abil...