Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "Linux Tools Project/Git"
(Add information on fetch+rebase vs. merge) |
(→Branches) |
||
| Line 20: | Line 20: | ||
== Branches == | == Branches == | ||
| − | Please ensure that you fetch and rebase rather than merge. When new branches are created, please use the [EGit/User_Guide#Branch_Creation_Dialog "Rebase" pull strategy]. This is similar to | + | Please ensure that you fetch and rebase rather than merge. When new branches are created, please use the [[EGit/User_Guide#Branch_Creation_Dialog "Rebase" pull strategy]]. This is similar to |
the commandline: | the commandline: | ||
Revision as of 13:53, 15 August 2011
{{#eclipseproject:technology.linux-distros}}
| Linux Tools | |
| Website | |
| Download | |
| Community | |
| Mailing List • Forums • IRC • mattermost | |
| Issues | |
| Open • Help Wanted • Bug Day | |
| Contribute | |
| Browse Source |
Contents
Git for Linux Tools
In late February 2011, we moved from SVN to Git. Our SVN repositories were joined into one Git repository (and one for eclipse-build).
Repository
- http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/ web
- git://git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools.git (anonymous)
- http://git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools.git (anonymous)
- ssh://<committerId>@git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools.git (committers)
First steps
- Learn about Git: Git, Pro Git, The Git Parable, Git Immersion
- Read about Git at Eclipse
- Note the process by which things must be committed at eclipse.org
Commit messages
- See guidelines others have written such as this one
Branches
Please ensure that you fetch and rebase rather than merge. When new branches are created, please use the EGit/User_Guide#Branch_Creation_Dialog "Rebase" pull strategy. This is similar to the commandline:
git config branch.<branchname>.rebase true
- Branches created for bug fixes
- prefix the name with the bug # and a 'very' short description (ex. 307258-automake-tabs-to-spaces)
- Release branches
- stable-Major.Minor
- Branches specific to a sub-project
- namespaced (ex. valgrind/remote, lttng/super-awesome-feature)
Tags
- Tag each release with vMajor.Minor.Micro
- See Semantic Versioning for more details