Skip to main content
Jump to: navigation, search

Difference between revisions of "Linux Tools Project/Git"

(Branches)
(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 [[http://wiki.eclipse.org/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 "rebase" pull strategy.  This is documented in the EGit User Guide:  [[EGit/User_Guide#Branch_Creation_Dialog]] and is performed on the commandline like so:
the commandline:
+
  
 
<tt>git config branch.<branchname>.rebase true</tt>
 
<tt>git config branch.<branchname>.rebase true</tt>

Revision as of 12:56, 15 August 2011

{{#eclipseproject:technology.linux-distros}}

Linux Tools
Website
Download
Community
Mailing ListForumsIRCmattermost
Bugzilla
OpenHelp WantedBug Day
Contribute
Browse Source

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

First steps

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 "rebase" pull strategy. This is documented in the EGit User Guide: EGit/User_Guide#Branch_Creation_Dialog and is performed on the commandline like so:

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

Back to the top