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

learn more… | top users | synonyms

5
votes
1answer
329 views

How is the Linux repository administrated?

I am amazed by the Linux project and I would like to learn how they administrate the code, given the huge number of developers. I found the Linux repository on GitHub, but I do not understand how it ...
0
votes
2answers
233 views

Github Workflow: Pushing small fix branches to remote, or keep them local?

In Scott Chacon's workflow (explained eg in this SO answer), with essentially two silos (development, and master), if, say I have a small bug to fix (e.g. can be fixed with a few characters) is the ...
23
votes
5answers
2k views

Why do Git users say that Subversion does not have all the source code locally?

I'm only going on what I've read on SO, so forgive me, but all I read says that one major advantage of Git over Subversion is that Git gives all the source code to the developer locally, not having to ...
3
votes
2answers
879 views

What is the point to namespaces in branches in git?

So I mainly use Mercurial for my projects and I decided to sit down and learn all Git's shenanigans to discover if I'm in the right side (at least for me). I'm learning that git uses namespaces for ...
3
votes
2answers
1k views

How can I get rid of just the untracked files in git? [closed]

In Mercurial I can do this with the bundled Purge Extension and executing the following command: hg purge Also good to get rid of ignored files: hg purge --all I'm curious about the most ...
-3
votes
1answer
405 views

Why can Perforce be a better version control system? [closed]

I've seen some people love and some loathe Perforce. As users or administrators with experience with other version control systems (free cookie to the ones with DVCS experience [git, Mercurial]), what ...
3
votes
3answers
415 views

What's the best way to manage reusable classes/libraries separately?

When coding, I naturally often come up with classes or a set of classes with a high reusability. I'm looking for an easy, straight-forward way to work on them separately. I'd like to be able to easily ...
3
votes
2answers
428 views

Is Perforce as good at merging as DVCSs?

I've heard that Perforce is very good at merging, I'm guessing this has to do with that it tracks changes in the form of changelists where you can add differences across several files in a single ...
3
votes
1answer
217 views

git changing head not reflected on co-dev's branch

Basically, we undid history. I know this is bad, and I am already committed to avoiding this at all costs in the future, but what is done is done. Anyway, I issued a git push origin ...
3
votes
1answer
2k views

Useful git commit messages for merged branches

As a follow-up to this question: If I'm working on a team by myself, I can maintain useful commit messages when merging branches by squashing all the commits to a single diff and then merging that ...
11
votes
5answers
398 views

Why not commit unresolved changes?

In a traditional VCS, I can understand why you would not commit unresolved files because you could break the build. However, I don't understand why you shouldn't commit unresolved files in a DVCS ...
5
votes
2answers
340 views

I have a library and several small programs that use it: how should I structure my git repositories?

I have some code that uses a library that I and others frequently modify (usually only by adding functions and methods). We each keep a local fork of the library for our own use. I also have a lot of ...
2
votes
1answer
247 views

Sharing a database while we work on local copies?

A friend and me are working on a webapp. We're using git so each of us has a local copy of the app. But the problem is the database. We want to be able to see the latest changes the other person made. ...
5
votes
1answer
624 views

svn vs git for the sole developer? [closed]

If I am sole developer (I do not work in a team) working from my laptop (Windows OS and Linux VM) and backing up data to the cloud (Dropbox etc), then is git still better than svn for my version ...
5
votes
3answers
6k views

Pulling changes from master to my work branch?

There's two of us working on something. We're using this branch structure master dev-A dev-B We both work on separate branches (dev-A,B) and whenever we're done - we promote our changes to master. ...
7
votes
3answers
803 views

Examples of non open source projects on Bitbucket or Github

Need examples to show management that these are used for source control and effectively backup of projects. They will be concerned about having their source code off-site. If there are good ...
0
votes
1answer
181 views

Git commit messages with nvie branching model

This Git branching model recommends branching for all development efforts and merging when complete: Branch Develop Merge when complete I'm wondering how this works in practice, given that ...
2
votes
1answer
193 views

Tracking work history in a git repo

Previous related questions: Code bases for desktop and mobile versions of the same app Git branching and tagging best practices Question: I have split my repo into three directories (swing, ...
20
votes
2answers
11k views

Git branching and tagging best practices

I am currently learning to use Git by reading Pro Git. Right now I'm learning about branching and tags. My question is when should I use a branch and when should I use a tag? For example, say I ...
4
votes
2answers
319 views

Which VCS is efficient for storing small changes to big text files?

A government agency publishes a text file with thousands of records. The entire file is about 60MB. Every day the file has about 60 new or changed records. We need to validate some info against that ...
2
votes
1answer
165 views

Can DVCSs enforce a specific workflow?

So, I have this little debate at work where some of my colleagues (which are actually in charge of administrating our Perforce instance) say that workflows are strictly a process thing, and that the ...
6
votes
1answer
1k views

Testing Git competence

I hire a lot of programmers for tiny tasks. I very clearly specify that the tasks can only be completed by making a pull request on GitHub. Unfortunatelly, so many programmers do not know Git and ...
19
votes
4answers
6k views

How does one handle sensitive data when using Github and Heroku?

I am not yet accustomed with the way Git works (And wonder if someone besides Linus is ;)). If you use Heroku to host you application, you need to have your code checked in a Git repo. If you work on ...
20
votes
6answers
2k views

Specific reasons for still using Subversion? [closed]

I want to choose a version control system for my company. So far I know I have Git, Subversion and Mercurial. These days I see that Git is the most used, so I'm left wondering: would there be any ...
5
votes
1answer
412 views

How should I incorporate a hotfix back into a feature branch using gitflow?

I've started using gitflow for a project, and I have an outstanding feature branch as well as a newly created hotfix. Per the gitflow workflow, the hotfix gets applied to both the master and develop ...
5
votes
5answers
357 views

What is the right way to version control a password protected archive?

I'm working with a local file which I always extract from a password protected archive (RAR), do some modifications/additions to it and overwrite the old file inside the archive with the new file (I ...
12
votes
1answer
1k views

Git workflow / practices for a small project (flowchart in png)

I'm trying to come up with a personal workflow. I've put together a flowchart of the hypothetical lifespan of a release: one developer pushing to a public github repo + a friend helping with some ...
47
votes
2answers
17k views

Choosing between Single or multiple projects in a git repository?

In a git environment, where we have modularized most projects, we're facing the one project per repository or multiple projects per repository design issue. Let's consider a modularized project: ...
6
votes
3answers
2k views

version control security

We are looking for a version control tool. I personally think it's pretty cool to use Git. However, my boss recommends TFS. He told me it's much more secure to use an SQL Sever based tool, such as TFS ...
10
votes
2answers
1k 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 ...
27
votes
4answers
1k views

Should a github maintainer rewrite author's in pull requests?

I'm not a programmer by profession, but I do some coding and have used github some. I've run across what I find to be a surprising situation. I'm very familiar with git. There is a project which I ...
5
votes
3answers
1k views

How can I prevent users from merging origin/X into Y in git?

Is it possible to force git to only merge remote tracking branches into the corresponding local branch? E.g. assume origin/X tracks X on origin and corresponds to local X and the same for origin/Y and ...
2
votes
2answers
258 views

Good practice to seperate Git Repo from published Repo?

We have a central Git repo from which developers fetch and push changes. They make changes on the default master branch. Our Continuous Integration (CI) tool builds artifacts off this default master ...
4
votes
2answers
1k views

How can I get an anonymous user to submit bugs on a private GitHub project?

Our company has a private GitHub repository for the project I'm working on. After a full summer of work, it looks like we'll be launching this week (wheee!). However, I want to include a "submit a ...
22
votes
3answers
2k views

Why should I push if I'm working alone in a local repository?

I'm interacting with Git through GitHub for Windows, which is funny since I'll never push my repository to GitHub. I'm working on it alone and it's intended to be used only by me. I noticed that my ...
9
votes
2answers
417 views

Any reasons not to use multiple version control systems?

I'm working on a project which uses GIT as the main version control system for trunk, the official branches and most sub-projects/unofficial branches. As such, I want to make my own branch use GIT to ...
3
votes
1answer
160 views

How to distribute a web app (that's hosted by the customer)

We're developing a web app that visualizes financial data. We have our first customer, but hope to get more. The terms are that the customers pay a setup fee, to customize the app for their needs ...
0
votes
4answers
1k views

Searching in a repository

I'm very new to source control management and one thing puzzles me: is it possible to search through the whole repository for a string? For example I'm tracking one file, which has 100 commits and I ...
2
votes
3answers
1k 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, ...
21
votes
4answers
2k views

I am a git user confused by mercurial's branching. How am I supposed to track small changes?

I've always used git before, but I want to contribute to python so now I have to learn mercurial and I find it very frustrating. So, I've made a couple of small patches and I wanted to track them as ...
3
votes
4answers
673 views

Approaches to manage related binary files, apart from code [duplicate]

I'm working on a website for a photographer, the whole code is just a few files, and whole repository is a few MBs without the actual photographs. But, when I add the actual photographs to git and ...
12
votes
2answers
575 views

What's the proper way to check commit data in Git?

My goal is to check commit data that don't meet certain requirements and then reject either the commit being created or pushed to the remote repository. The problem of doing a pre-commit hook is that ...
4
votes
3answers
5k views

Managing multiple people working on a project with GIT

I'm very new to GIT/GitHub (as new as starting yesterday). I would like to know what is the best way to manage multiple people working on the same project with Github. Currently I'm managing one ...
6
votes
4answers
2k views

Working with Git on multiple machines

This may sound a bit strange, but I'm wondering about a good way to work in Git from multiple machines networked together in some way. It looks to me like I have two options, and I can see benefits on ...
6
votes
5answers
854 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 ...
8
votes
2answers
239 views

What is the canonical approach to using a VCS right from a project's infancy?

Background I've used VCS (mainly git) in the past to manage many existing projects and it works great. Typically with an existing project, I would check in each change I make to the code that either ...
10
votes
3answers
612 views

Git: Fixing a bug affecting two branches

I'm basing my Git repo on A successful Git branching model and was wondering what happens if you have this situation: Say I'm developing on two feature branches A and B, and B requires code from A. ...
11
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?
2
votes
2answers
2k views

Can I do a git merge entirely remotely?

My team shares a "work" branch and a "stable" branch. Whenever a particular work branch is approved for further testing/release/etc, we merge it into stable. No code is ever checked directly into the ...
4
votes
2answers
939 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 ...