Skip to content

Commit ebb10b5

Browse files
author
Kevin Willford
committed
BRANCHES.md: Add explanation of branches and using forks
1 parent db2e92b commit ebb10b5

File tree

1 file changed

+51
-0
lines changed

1 file changed

+51
-0
lines changed

BRANCHES.md

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
Branches used in this repo
2+
==========================
3+
4+
The document explains the branching structure that we are using in the git for VFSForGit repository as well as the forking strategy that we have adopted for contributing.
5+
6+
Repo Branches
7+
-------------
8+
9+
1. master
10+
11+
This will track the git for windows repository master branch
12+
13+
2. vfs
14+
15+
Would like to use this branch as an ever-green branch that continually rebases the VFSForGit changes onto a windows ever-green branch that is on the core/master, so that we can detect when the patches for VFSForGit have issues or if we have a new version patches sent upstream git we can regenerate this branch.
16+
17+
3. vs/master
18+
19+
This tracks with the git for windows repository vs/master branch and are the generated files for using a Visual Studio solution.
20+
21+
4. vfs-#
22+
23+
These branches are used to track the specific version that match git for windows with the VFSForGit specific patches on top. When a new version of git for windows is released, the VFSForGit patches will be rebased on that windows version and a new gvfs-# branch created to create pull requests against.
24+
25+
#### Examples
26+
```
27+
vfs-2.20.0
28+
vfs-2.20.1
29+
```
30+
31+
The versions of git for VFSForGit are based on the git for windows versions. v2.20.0.vfs.1 will correspond with the v2.20.0.windows.1 with the VFSForGit specific patches applied to the windows version.
32+
33+
Tags
34+
----
35+
36+
We are using annotated tags to build the version number for git. The build will look back through the commit history to find the first tag matching `v[0-9]*vfs*` and build the git version number using that tag.
37+
38+
Forking
39+
-------
40+
41+
A personal fork of this repository and a branch in that repository should be used for development.
42+
43+
These branches should be based on the latest vfs-# branch. If there are work in progress pull requests that you have based on a previous version branch when a new version branch is created, you will need to move your patches to the new branch to get them in that latest version.
44+
45+
#### Example
46+
```
47+
git clone <personal fork repo URL>
48+
git remote add ms https://github.com/Microsoft/git.git
49+
git checkout -b my-changes ms/vfs-2.20.0 --no-track
50+
git push -fu origin HEAD
51+
```

0 commit comments

Comments
 (0)