hi, I'm having a bit of a problem. We have our own CMS which is using git for collaboration and versioning and stuff. Now i have two git repositories A and B, A which is a project and B which is the CMS itself. Now i want to get B into A, but when i do this i get alot of merge-conflicts and the solution for the conflicts is always to us...
Our team doing a project in asp.net & Mssql 2005.since our team member are distributed. we need a online tool for tracking project changes, and control access to our online code repositories. While searching i got tools like http://codesion.com , http://repositoryhosting.com is project mangement possible using http://codesion.com , ht...
Possible Duplicates: How do I push amended commit to the remote git repo? Undoing a git push Hi, I've deleted some commits from my master branch by using git reset --hard SHA_VALUE I have, however a remote version of the repository on github, and whenever I git push things, I get an error message, that I should merge the...
Problem: i need to verify git repo properties (ssh key,repo url) in ruby solutions: 1) write ssh key into ~/.ssh/id_rsa file and execute git clone command with repo url property - easiest way cause race conditions when multiple users trying to check theirs repos. 2) write key into any file and link server and key in ssh.config file...
I have this (git repo): A--B--C--D ->master \--E ->dev And I want to bring only commit D to branch dev (D doesn't depend on C), so that: A--B--C--D ->master \--E--D' ->dev But D' shouldn't get added to master after a merge: A--B--C--D--E' ->master \--E--D'/ ->dev This is because I want to bring only a file update ...
Hello :) I'd like to host some open source code on a public repository, and I really like how pretty GitHub makes this kind of sharing. Unfortunately, Git is not an option for these projects, for the most part because I'm developing for/on Windows, and Git support on Windows is not anywhere near where Subversion's support is. I'd like...
Little context: We are a team of 6 developers working a web application. Since launch we have been using CVS as our source control system on a Windows server using ColdFusion w/ Eclipse. With all the hype around Git and distributed systems lately we thought we would check it out. As a standard web application we have our local environ...
Hi On my local git repo I've got many commits, which include 'secret' connection strings :-) I don't want this history on github when I push it there. Essentially I want to push everything I have, but want to get rid of a whole lot of history. Perhaps I would be better running in a branch for all my dev, then just merging back to mas...
I had problems finding the answer to this so I am posting it for posterity. The situation is, you have a git repo with a submodule (similar to an svn external). You want to update that reference to point to a different commit in the external repository. You might think 'git submodule sync' or 'git submodule update' would do that - you...
I had a working gitosis installation on debian lenny, but the server got updated, and now when i try to push/pull/fetch, the connection times out. It would probably be a good idea to update to the latest build of gitosis, but I can't find anything on how to upgrade the software. How would I upgrade gitosis? Do I just reinstall? ...
Hi, can you recommend any no-brainer solution for setting up a git repository accessible via http(s, has cleutus suggested)? I have my own http server and I'd like to use it to host some minor private project. At home I can ssh it, but at work firewalls keep me from doing so. Is there any free way to set up a small private git reposito...
We are planing to migrate our repositories from svn to git. However there are some people using np_subversion which integrates SVN into the TYPO3-Backend. np_subversion calls the svn client to make updates, commits, show logs etc. I am looking for a tool that behaves like the svn client but works on a git repository as its backend. (Kin...
For deploying to Heroku, I use git push heroku master. But how do I see which revision I pushed up to heroku? (I'm often in doubt if I pushed the recent version up) For those not familiar with it, Heroku's create script generates a remote git repository that you push to. Upon push, the code is deployed magically. Heroku adds a remote r...
I have a problem with a SVN branch. I made a checkout of it with git checkout -t -b stable svn/stable. Then I did a merge with git rebase master. After that I tried to commit the merge changes into the remote branch with git svn dcommit But now it seems, that Git pushed the changes into the trunk instead of the branch :( And git status...
I can't quite figure out how to see what exactly was changed, in the remote repository, by a 'push'. 'git log' shows me the series of commits but those took place in my local repository and were pushed at different times; I would like to know which commits were part of each specific 'push' ...
Git is making me pull my hair out. I know how to create a local branch that tracks a remote branch, but I want to create a remote branch which copies another remote branch, and then track. Creating a remote branch is also easy, but it seems to always uses the codebase in master, not in an arbitrary branch. What's the sequence of comma...
I have some automated tools that are accessing a git repository through cvs and git-cvsserver. I would like these tools to be able to see the commit ID of the content that they checked out. Is this recorded somewhere in the CVS metadata directory? ...
i would like to know which files would be updated (and hopefully the changes that would occur) if i'd do a 'git pull'... is git stash git fetch git diff origin/master git stash apply the answer ? ...
I'm getting a recurring issue with git-p4. On syncing with git-p4 clone //depot/project/main the majority of files are synced up but there are a number of exceptions for which I can find no apparent common denominators. I created a separate Perforce workspace to use with git-p4 and globally set the properties git-p4.client to this work...
Hi all, For our dev team we need to conduct code reviews regularly. Our core requirements are: It is hosted somewhere so we don't have to bother with supporting the infrastructure for it It can integrate with our existing git repository It has simple and straightforward work flow: create a code review request based on the differences...