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

learn more… | top users | synonyms

2
votes
1answer
165 views

Fork Management of Git Multi-level Hierarchies

We have the following Git hierarchy structure in place, where each child is forked from the parent. If we build something in Client1 that will be useful in the entire hierarchy, what is the best way ...
-1
votes
0answers
61 views

Suggestion for a git workflow

I need some suggestions from you about a (nearly perfect) git workflow. Let me tell you something about the project circumstances: We are developing a large application in four agile teams (about 6-...
2
votes
2answers
69 views

How do I manage a major overhaul of an open-source project with git?

I have a somewhat popular open-source project on Github, and I'm getting ready to do a major overhaul - completely different directory structure, substantially different versions of major components, ...
1
vote
2answers
129 views

Git - single or multiple branch

I am working on this project of mine where I am the only developer. I have chosen git for the version control for the project. Currently, I work from multiple systems and commit to the master branch ...
0
votes
1answer
65 views

GitFlow, should my release branch include minor version number?

I've found it difficult to find a definitive answer to this question. Using Semantic Versioning and GitFlow should my release branch include the minor version number? I'm not referring to tags. My ...
6
votes
3answers
199 views

When to commit work in git?

When I'm working on a project, I tend to write a lot of code. A lot of code means alot of bugs. If I commit my work early on , I have to edit that commit when I encounter a bug and fix it. This is why ...
0
votes
0answers
20 views

Is there a way to group branches from separate Git repositories [using Visual Studio]?

At my job we are migrating from TFS to VSTS Git, though the VCS types probably don't really matter as much as how we're using them. We use VS2015 for development usually, in case that matters. The ...
1
vote
1answer
42 views

How do I organize my project to accomodate GIT pull requests for source installed via PIP?

I want to structure my Python project in a manner such that others can use a package manager (PIP) to easily clone the environment for team development, and GIT to contribute to the project, plus a ...
2
votes
1answer
132 views

Use git to manage different deployments of the same repo

I have a web application built in PHP. I want to use Git to manage the different aspects of the deployment. Some of the files in the web app are specific to a client (logos, database connection ...
7
votes
3answers
292 views

How can I group commits in a version control system such as git

Instead of a one long flat commit history, why isn't there a hierarchy, so at the top level you might have pull requests, then you could go down a level and look at the commits in that PR. I realise ...
1
vote
0answers
48 views

Is this a useful analogy between the blockchain and Git?

I am trying to understand the concept of the blockchain (the supporting structure behind bitcoins). To this end I am playing with an analogy between it and Git. My question is, if this is a valid/...
3
votes
2answers
603 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
89 views

According to GNOME guidelines, should git messages end with a full stop, or not? [closed]

According to GNOME guidelines, how sentences should be written in Git messages? Should sentence in git commit message start with upper-case letter and end with a full stop, or lower-case without a ...
16
votes
4answers
5k 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 ...
4
votes
2answers
137 views

Should I have a 'dev' branch separate from a 'production' branch?

I recently set up my staging and production server environments on Heroku and everything is working great. Through Heroku, you can deploy from a Git branch - e.g. master or my-feature. This got me ...
5
votes
1answer
541 views

Visual Studio, Git, and common code

I'm looking for some advice on how I should arrange a large new project I'm working on to allow it be more easily managed in Git (using GitLab), and developed in Visual Studio. To give an idea of ...
44
votes
8answers
3k views

Should a git commit message mention the file that was modified?

In the first line of a git commit message I have a habit of mentioning the file that modified if a change doesn't span multiple files, for example: Add [somefunc] to [somefile] Is this a good ...
0
votes
0answers
29 views

GIT - where/how do I save my Private SSH keys? [migrated]

I'm using Git, I want to have multiple keys. I'm reading I should use ssh/.config. The first thing I need to include is where to find the SSH key. Where do I save it? Do I just create a .txt file ...
0
votes
0answers
41 views

I've used Git with Github, but now I need to use it with something else. How can I add another SSH key? [migrated]

Sorry if this is not the right stackexchange. I have used Git with Github and that works well. I now want to use Git with my own website which is on a live site. My host provided me with an SSH ...
1
vote
2answers
61 views

Installing multiple versions of software with git

I'm really struggling to understand git, so here's a tighter rephrasing of a previous question I had asked. I'm going to explain a hypothetical scenario, detailing what I think happens when you ...
1
vote
2answers
96 views

Github Parent commit committed after child commit?

I'm looking at this commit which was committed "26 days ago" and the parent commit which was committed "25 days ago". How can the parent commit be committed one day later than the child commit?
0
votes
0answers
47 views

Which git branches should I tag?

I read this nice post: Git branching and tagging best practices I really like the NVIE git branching model and I try to use something very similar: http://nvie.com/posts/a-successful-git-branching-...
50
votes
1answer
3k 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
3answers
727 views

Moving from a CVCS to a DVCS in a big company, what is the right way to do it?

I just started a new job and I'm currently at the process of trying to introduce a DVCS (mercurial, but the actual DVCS is not really a matter of discussion at this point, it could also be git) to the ...
5
votes
0answers
81 views

Are there any other Git porcelains other than the default one? [closed]

One of Linus's emails mentions the separation of the Git tools into the "plumbing" (usable by automated tools) and a user-friendly interface on top of the that (which has later come to be referred as ...
17
votes
5answers
6k 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, ...
0
votes
0answers
88 views

Is updating a remote-tracking branch by local branch a good practice?

In Pro Git you can see: Remote-tracking branches are references to the state of remote branches. They’re local references that you can’t move; they’re moved automatically for you whenever you ...
0
votes
2answers
103 views

git clone vs cp -R

I want to use an existing project as a starting point for a new project by copying or cloning it. There are at least two ways of doing this. Method 1: Copy it. cp -R /path/to/source /path/to/dest ...
11
votes
2answers
648 views

Where to push a failing test?

I just changed branch settings on my GitHub repository, so that my [next] branch requires a passing CI build through a pull request. A discussion followed with a number of team members, about failing ...
1
vote
3answers
134 views

Git: how to test local code before commit

Let's say I have two files I am working on - "a.txt" and "b.txt". I need to commit my change to "b.txt" but want to keep working on "a.txt" for some more time. I do a "git add b.txt". Now, before I ...
110
votes
8answers
78k views

What does 'stage' mean in git?

I find git hard to understand as I could not find the meaning of the words used for the actions. I have checked the dictionary for the meaning of 'stage' and none of the meanings were related to ...
4
votes
1answer
166 views

small team git workflow

I want to ask if the following workflow is correct! It is referring to a small private team. There is a master branch where no one merges there ( except the maintainer ), a development branch and ...
0
votes
0answers
34 views

rebase equivalent - update specific branch?

If I reach the point where I am updating my local master: git checkout master git fetch upstream # I am pulling changes from develop branch into my local master git merge upstream/...
2
votes
0answers
69 views

Implementing redundant GIT backup scheme

I want to push a local repo to multiple remote GIT repositories to achieve redundancy in my backup scheme. So, let's say I plan to use Github and BitBucket to host my repositories. I have two ...
6
votes
1answer
112 views

Why can't Pull Requests be seriously implemented in Mercurial?

A week ago, I was at LFNW and as I was talking with Larry Hastings after his talk, he said (paraphrased): There's something in Git that makes the Pull Request workflow possible that isn't there in ...
0
votes
1answer
30 views

Sharing Project configuration files for an application with Qt IDE using Cmake and sharing via Git?

Imagine that you are starting to work in a project with a group of people. You want to share your code and the full configuration files of CMake, Qt IDE configuration. So you if you want to test or ...
1
vote
0answers
68 views

Does TFS have the capacity equivalent of branching/forking in Git?

We've got talking about branching and forking in Git and a teammate asked if there's something like that in TFVC (hereafter referred to as TFS). I explained that there is, although it's managed ...
5
votes
2answers
291 views

Is licensing an issue for Git Submodules?

For example: an MIT-licensed project wishes to simplify the build process for its users by including part of the GNU toolchain (which is of course GPL) as a Submodule. Could that be interpreted as ...
247
votes
14answers
24k views

Why does everyone use Git in a centralized manner?

I have used Git at my past two companies for version control. It seems from what I've heard that about 90% of companies use Git over other version control systems. One of the biggest selling points ...
9
votes
4answers
7k views

Why should large financial/insurance companies use git and/or github

I work for a large enterprise (30K employees) in the financial/insurance industry. While "IT" isn't our main focus, let's be honest, these are information driven industries and the companies with the ...
1
vote
0answers
68 views

Working on the same file for two tickets

The company policy where I work is that code cannot be committed to SVN until a code review is complete. This is sensible enough as we don't want broken code ending up in the repo, but it does give us ...
7
votes
3answers
196 views

Version control on standalone (in-house) libraries?

Problem Statement At our company, we have various application projects that we work on and then we also have libraries that those projects need to utilize. I feel the need (based on some similar ...
-2
votes
1answer
56 views

Repository UUID equivalent

I am converting an old Subversion repository to Git. Here is an example: $ svn info http://alfa.com/bravo/charlie Path: charlie URL: http://alfa.com/bravo/charlie Relative URL: ^/charlie Repository ...
16
votes
4answers
3k views

Workflow: Using binary document formats in Git without locks (moving from subversion)

We're a software consultancy with a multitude of projects for different customers. We traditionally use Subversion, but are currently considering moving to Git. A significant portion of the documents ...
22
votes
1answer
942 views

Can a git commit have more than 2 parents?

In this documentation it is mentioned A commit object may have any number of parents. But from my understanding, the only case where a commit will have more than 1 parent is when a merge has ...
2
votes
1answer
71 views

Structuring git repository as a 'catch-all'

I have a really old install of Debian on my Thinkpad, and I want to refresh it now that I'm using it again. However, I have a LOT of old scripts all over this install for beauty fixes, shortcuts, and ...
0
votes
2answers
1k views

Correct way to undo the past few git commits including a merge? [closed]

My team is working with git for the first time and has really messed up our git remote due to our inexperience. I'm trying to help educate them on git to solve the problem in the long term, but in the ...
15
votes
4answers
7k 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 ...