Git is an open-source DVCS (Distributed Version Control System)

learn more… | top users | synonyms

244
votes
20answers
74k views

What does SVN do better than Git? [closed]

No question that the majority of debates over programmer tools distill to either personal choice (by the user) or design emphasis, that is, optimizing design according to particular uses cases (by the ...
1
vote
1answer
582 views

How to maintain a forked git repo with feature branches that upstream won't pull?

So here's a typical workflow on Github... Like some project -> fork it -> git clone https://github.com/you/someproject. Open project. Like what you see, but make some changes. Having been ...
12
votes
1answer
401 views

Etiquette for editing someone's pull request

I own a repository on GitHub to which someone sent a pull request with one single commit. I only want to implement his solution partially, and use about half of the code changes the user made. What ...
3
votes
2answers
194 views

GIT and different versions of a project: what are the best practices?

I'm very new in using GIT as a versioning system and despite a lot of searches, I can't seem to really understand how to handle my scenario. I have this web project that needs to be developed in two ...
0
votes
1answer
116 views

using pre-commit / post-merge hook script to replace configuration values

I'm having some problem developing a web application with various developers, each one has an specific configuration to work. and i would like to use the less resource cosuming approach to avoid that ...
4
votes
2answers
165 views

Sharing only part of code with git

The situation I have code which has features X and Y. Bob needs access to the code to help develop feature X further. Normally I would allow Bob to clone the code, but the problem is that feature Y ...
2
votes
4answers
345 views

How to minimize merge conflicts when using non-lock VCS like git?

I have been using git for about four months now. While I like most of its features, I find it rather inconvenient that multiple developers can make concurrent changes to the same file and then a need ...
8
votes
2answers
476 views

What's the best Git workflow for working with an open source project with employer-specific changes?

At my current employer, we are using an open-source project hosted on Github as a component of our application. I have been working on this project to both add some features that we need and to ...
2
votes
1answer
165 views

What workflow do you find efficient when simultaneously developing multiple inter-dependent GIT branches? [closed]

Let me start by saying that my GIT knowledge is fairly shallow, so I'm guessing that there might be something I'm missing. THE SETUP: As an example, we have a project which is being developed as a ...
16
votes
3answers
1k views

Strategy for code review before merge to master from feature branches

Me and my team use feature branches (with git). I'm wondering which is the best strategy for code review before merge to master. I checkout a new branch from master, lets call it fb_#1 I commit a ...
27
votes
5answers
2k views

Why do so many websites prefer “git rebase” over “git merge”?

One of the advantages of using a DVCS is the edit-commit-merge workflow (over edit-merge-commit often enforced by a CVCS). Allowing each unique change to be recorded in the repository independent of ...
3
votes
2answers
120 views

Managing codebase for basic and pro edition of a project

I have a project which will have basic and professional edition. The professional edition will have all the features of the basic edition. I am using git to manage the project's codebase. I consider ...
1
vote
2answers
110 views

Finish feature reverted commits from develop

I am using git as a version control system, and using git-flow as the branching model. I started a feature branch some weeks ago in order to maintain the system in a clean state while developping that ...
6
votes
5answers
980 views

What is an effective git process for managing our central code library?

Quick background: we're a small web agency (3-6 developers at any one time) developing small to medium sized Symfony 1.4 sites. We've used git for a year now, but have previously used Subversion. For ...
1
vote
3answers
249 views

How do I set up pairing email addresses?

Our team uses the Ruby gem hitch to manage pairing. You set it up with a group email address (e.g. dev@mycompany.com) and then tell it who is pairing: $ hitch james tiffany Hitch then sets your Git ...
16
votes
1answer
3k views

Pulling in changes from a forked repo without a request on GitHub?

I'm new to the social coding community and don't know how to proceed properly in this situation: I've created a GitHub Repository a couple weeks ago. Someone forked the project and has made some ...
9
votes
3answers
2k views

Why is bitbucket popular in eastern europe? [closed]

I was looking at google trends for bitbucket and github, and it seems bitbucket leads github in Romania, Bulgaria, and Latvia. Why is this so? Are there any historical reasons for this?
6
votes
3answers
2k views

code review with git-flow and github

With regular git and github I can do a code review by simply creating a pull request of the feature branch I'm working on to the master branch. How would I do code reviews with git-flow? With workflow ...
1
vote
3answers
370 views

Organisation GitHub account. Secure to use for personal projects?

So a large client of mine gave me access to their Organisation GitHub account. With it came a login for myself (on github.companyname.com) and of course access to certain repos on their company ...
26
votes
4answers
6k views

Why does the Git community seem to ignore side-by-side diffs [closed]

I used to use Windows, SVN, Tortoise SVN, and Beyond Compare. It was a great combination for doing code reviews. Now I use OSX and Git. I've managed to kludge together a bash script along with Gitx ...
11
votes
3answers
3k views

github team workflow - to fork or not?

We're a small team of web developers currently using subversion but soon we're making a switch to github. I'm looking at different types of github workflows, and we're not sure if the whole forking ...
1
vote
1answer
186 views

Why doesn't Git daemon start in the background? [closed]

Just as in the title, why doesn't git daemon start the service in the background, since it's a "daemon", being a background process? I know that I can start it in the background using git daemon ...
3
votes
1answer
77 views

Could a reflog replace tags for bookkeeping?

My repository has a branch production and is filled with countless tags of the format production-20130101-1234 that point to what has been actually shipped on the given datetime. I think this ...
1
vote
2answers
217 views

Two or one git repo for Android app + web service backend?

I'm wondering what the best practice is for my git repository structure where I have an Android application + a web service backend. In general, I'd like to release these two independently (e.g., perf ...
10
votes
3answers
196 views

Which is better for small bug fixes and small features - naming branches by ticket number or naming them by feature description?

I am in the middle of a disagreement (cordial, of course) with my lead about proper branch naming. This applies to bug-fix and small feature branches, not long-running feature branches. For ...
12
votes
4answers
2k views

Why do git commits not contain the name of the branch they were created on?

When working with git in a team using feature branches, I often find it difficult to understand the branch structure in history. Example: Let's say there was a feature branch feature/make-coffee, ...
10
votes
2answers
7k views

Structure of a Git repository

Sorry if this is a duplicate, I looked. We're moving to Git. In Subversion, I'm used to having \trunk, \branches and \tags folders. With Git, switching between branches will replace the contents of ...
1
vote
1answer
187 views

which directory to initialize git repo

I'm just getting started with Git. I'll be doing PHP development and was wondering if I should initialize my repo within my server root folder, or any directory on my hard drive and publish my ...
0
votes
2answers
158 views

Git temporary code-change

My program interacts with another application via a socket communication. The current public version of this application does not support a specific command while the newest trunk does. To be ...
11
votes
2answers
2k views

How can I organize personal git repositories?

I'm in the process of setting up a GitHub account with the plan of making a pair of libraries I developed as parts of some recent iOS projects freely available for other iOS devs to use. I don't ...
0
votes
2answers
109 views

Distributing a data access solution across multiple solutions

I have 3 solutions, one of them is a dataccess solution with all the repositories etc. At the moment when a change is made to it, the others have to go get the latest nuget version locally, we have a ...
5
votes
1answer
2k views

GitHub Organizations for a project spanning multiple repositories?

I've started a project that involves at least three repositories on GitHub. One of the repositories is a generic documentation-and-examples dump, and the other two contain the implementation of two ...
33
votes
1answer
1k views

What are the advantages and disadvantages of cryptographically signing commits and tags in Git?

So someone peer reviewed my work, and he told me that I should always sign my commits and tags cryptographically. When asked why, he didn't know to explain it to me, and said "It's just a good thing ...
4
votes
2answers
1k views

Gerrit, git and reviewing whole branch

I'm now learning Gerrit (which is the first code review tool I use). Gerrit requires a reviewed change to consist of a single commit. My feature branch has about 10 commits. The gerrit-prefered way ...
19
votes
10answers
1k views

Is it ever OK to commit non-working code?

Is it good idea to require to commit only working code? This commit doesn't need to leave the repository in a working state as: ... we are in early design stages, the code is not yet stable. ...
4
votes
3answers
1k views

Git: rebasing and keeping current to a remote branch - accepted practices?

When developing on a long-running branch (here defined as living longer than one release), what's the most accepted practice(s) to keeping the branch current with its origin while keeping the history ...
3
votes
2answers
79 views

Placing images into Git for a CRM

I have built this CMS that has the option to add entries to the database. Each entry that is created has about 5 to 10 new images showing the product for sale. Each image is about 150Kb in size. I ...
2
votes
2answers
2k views

how safe/sane is it to use git for deployment on my webapp production server?

I started with sftp, then switched to WebDAV and I'm currently using rsync through ssh to deploy any updates/upgrades from my development server into my production server. I'm still not very happy ...
4
votes
2answers
424 views

Git Staging: When to stage? What to do if modification occurs afterwards

I'm rather new to the broad world of Git. I have read the manual and have been practicing but I am confused about few aspects of it, which I couldn't figure out after searching for. I'm wondering: ...
2
votes
3answers
227 views

Using one repository for the foundation of another

I have an existing website theme that I have built. I've been using github to maintain this theme, let's call it dragon. We are changing the theme entirely but we're using the existing theme as a ...
1
vote
1answer
158 views

Using Git - better to do lot of incremental updates or one big daily update? [duplicate]

Ive just started working with Git (Github) in anticipation for an up coming project I'm project managing and designing and developing the front end of. One thing I couldn't work out is, is it ...
3
votes
4answers
855 views

Using Mercurial repository inside a Git one: Feasible? Sane?

I am thinking on creating a Mercurial repository under a Git repository. e.g. ..../git-repository/directory/hg-repo/ The 2 repositories Is it possible to manage (keeping your sanity)? How similiar ...
8
votes
4answers
5k views

How to evaluate moving to Team Foundation Server

My development team presently uses the following software in our workflow: JIRA Bamboo (Atlassian continuous integration) Greenhopper (Atlassian agile project management) Confluence Git, hosted on ...
2
votes
3answers
2k views

BitBucket working with multiple developers on same project

I am new to BitBucket. I have my repository. And 2 people working on it me, Admin and another developer with Read only access. So in order for him to do changes he forked repository and made changes, ...
0
votes
1answer
326 views

Git Branch Model for iOS projects with one developer [duplicate]

I'm using git for an iOS project, and so far have the following branch model: feature_brach(usually multiple) -> development -> testing -> master Feature-branches are short-lived, just ...
16
votes
1answer
822 views

My github pull request was merged, what's the convention at this stage?

I forked a project on Github, made a small change and sent a pull request to the original maintainer, who has pulled it in. Now the last commit there is Merged pull request #11 from ...
6
votes
2answers
692 views

Git for a solo developer [duplicate]

I'm a developer working on a Wordpress project. I work on this alone and I want to improve the way I use Git but I don't know where to start. Currently, I'm using git to commit all of the work that ...
0
votes
0answers
108 views

GitShell, how can I not type the username and passwords?

Open the CMD, and I should type the password and usename? In the GitShell opened by shortcut, I don't need to type the username and password. Related is here: How can I convert GitShell's ...
12
votes
4answers
3k views

Using git correctly in a small team

What would be the easiest way to use git correctly in a small team of about 5 developers, with one server running the live application?
30
votes
6answers
1k views

Are Frequent Complicated Merge Conflicts A Sign of Problems?

On our team, we use Git as our source control. We have several areas of code that are almost independent but have some overlap. Lately we have been discussing workflows and approaches to using source ...