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

learn more… | top users | synonyms

4
votes
1answer
127 views

Make a change that is ignored by future merges

I have a git repository, and I'd like to make a "debug" branch. In the "debug" branch, I'd like to add a line: debug = true; But I want to make sure that any merges back to master ignore that ...
1
vote
1answer
115 views

How to organize repositories for a split library?

I have two libraries that implement a protocol: one provides tools for establishing a channel between two parts, and the other provides classes and tools for building and parsing the binary protocol ...
1
vote
1answer
91 views

Git Repository Setup

I am moving my companys source control from TFS to GIT. We have TFS currently defined as. Project Collection / / Client A / Product A / Product B / Product C / Client B / Product D / Product E / ...
1
vote
1answer
486 views

Is using external repositories PCI-DSS compliant

We are considering using BitBucket rather than hosting our Git repositories internally. Does anyone know if this breaks any rules of PCI compliance? I haven't been able to find much information on ...
5
votes
4answers
312 views

Techniques to avoid entangling git merges when working on an extensive change

I am absolutely miserable when I get in a situation where I have to merge other developers' changes into mine. When using git and working on a really extensive change, that happens a lot. When I ...
2
votes
1answer
164 views

Scaling up Git to Team Usage

For the last 3 years I have used git on an almost daily basis for all my pet projects and at work for small projects that were not in the global SVN repository. My workflow is quite similar to the ...
1
vote
1answer
108 views

Should I use git and mercurial in the same directory?

I am looking for a solution for having revision control on framework code and project code at the same time. If I am using a MVC framework, there may be specific directories where I should put my ...
13
votes
5answers
5k views

Is it reasonable to use git only on my local machine?

Is it ok to just use git only locally? I don't want to have to pay for a service that provides private repositories (such as Github) but I think git is a great way to organize my closed-source ...
1
vote
1answer
356 views

Commit projects individually or whole solution?

I am working (alone) on an application that is a music portal where you can search for artists, songs etc ... The C# solution consists of: a class library that contains all the stuff to access the ...
2
votes
1answer
96 views

Build number when supporting previous version

I am developing and maintaining a web-based application that's used internally at my job. I am the only developer and so I'm not really using branches; everything happens on the trunk. I do tag ...
17
votes
6answers
860 views

When should I stop committing to master on new projects?

Whenever a new project starts, it usually makes sense to start by committing straight to master until you've got something "stable", and then you start working in branches. At least, this is how I ...
1
vote
1answer
132 views

Additional actions in setup.py for install

Background So, I'm developing a project, and I'm writing setup.py script for it, using distutils. I'm using CPython3.3. I use some libraries that have invalid distributions in PyPI, so they have to ...
2
votes
4answers
436 views

Private comments in git

I need to add a feature to some code in a big project and due to the complexity I find it very helpful to add detailed comments to many lines to keep track of what's happening. This is only for my own ...
11
votes
4answers
433 views

Moving a multi-GB SVN repo to Git

Currently my company has a Visual Studio solition in an SVN repo that's organized as follows: SolutionFolder (~3.5 GB) |-> SolutionName.sln |-> .. Some source code folders... (~250 MB) |-> ...
1
vote
1answer
69 views

Is it possible to tag only a portion of a git push?

I'm very new to git, but last week I installed it, set up bitbucket, and pushed my current project to my first bitbucket repo. All went well and I'm pleased with git as a simple, powerful, yet free ...
7
votes
2answers
657 views

What's the best way to undo a Git merge that wipes files out of the repo?

So imagine the following the happens (and that we're all using SourceTree): We're all working off origin/develop. I go on holiday for a week. My coworker has been working locally for the past ...
5
votes
1answer
317 views

Team Git workflow working with a multi-project Sitecore solution using TDS

We are a team of 8-10 developers working on different parts of a Sitecore instance. In the past we've used SVN and more recently (and successfully) Hg, but are moving to using Git as our primary ...
0
votes
1answer
144 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
180 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 ...
3
votes
6answers
810 views

How do you handle multiple developer configuration in a project?

I've been thinking lately about how I handle config changes between multiple developers on a project. Specifically here about a Laravel project in PHP, but I guess this applies largely to all ...
3
votes
4answers
430 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 ...
3
votes
2answers
205 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 ...
2
votes
1answer
205 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 ...
29
votes
5answers
4k 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 ...
9
votes
2answers
499 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 ...
3
votes
2answers
124 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
171 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 ...
1
vote
3answers
303 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 ...
1
vote
3answers
403 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 ...
39
votes
10answers
11k views

Why “Fork me on GitHub”?

I understand how GitHub works, but one thing I've been confused about is, why almost every OSS project lately has a "Fork me on GitHub" link on their homepage. For example, http://jqtjs.com/, ...
1
vote
1answer
864 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 ...
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 ...
1
vote
1answer
221 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 ...
13
votes
1answer
457 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
1answer
80 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
264 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 ...
12
votes
4answers
3k 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, ...
1
vote
1answer
203 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
201 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 ...
0
votes
2answers
112 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 ...
37
votes
1answer
2k 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 ...
5
votes
1answer
3k 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 ...
28
votes
11answers
2k 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. ...
3
votes
2answers
82 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 ...
8
votes
1answer
4k views

How to make a “git push” update files on your web host?

I have a few sites which are all hosted on the same web hosting service under shared hosting. My web host supports Git and I have SSH access to it, and I also have Git setup on my laptop as well. I ...
4
votes
2answers
585 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: ...
1
vote
1answer
184 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 ...
16
votes
1answer
882 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 ...
7
votes
2answers
832 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 ...
1
vote
0answers
128 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 ...