git-workflow

github like workflow on private server over ssh

I have an server (available via ssh) on the internet that my friend and I use for working on projects together. We have started using git for source control. Our setup currently is as follows: Friend created repository on server with git --bare init named project.friend.git I cloned project.friend.git on server to project.jesse.git I t...

How do you alter an object's historical content in a git repository?

I have a local git repository that I eventually plan on publishing as open source. I recently noticed that one of the files has a password in it. Obviously, I need to strike that password from the entire history before I publish the repository. A: Is there a way to access and modify the history for all revisions to that particular fil...

Best practice for modifying an already-merged git topic branch

We use the following git workflow at my company when coding up a new story: Create a topic branch off of master (production/stable) Create as many commits as desired to implement feature. do a git merge --squash of that topic branch onto the qa branch. QA people review. If good, the code is merged into the ua branch. If the User Accept...

how to setup this git workflow?

I want to be able to setup the following git workflow but it confusing as to which are the correct commands to use - rebase, remote, etc? Clone an open source project where I only have read only access to their git repo Make changes to the project and save those changes to my private github repo - lets call that 'development' Once dev ...