Changes between Version 82 and Version 83 of DeveloperGuidelines/Git


Ignore:
Timestamp:
01/02/14 11:48:32 (11 years ago)
Author:
Pat Tressel
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • DeveloperGuidelines/Git

    v82 v83  
    134134
    135135
    136 ==== Squashing and rebasing commits ====
    137 Before submitting code to be included in the trunk repository, two things should be done:
    138 * Rebase from trunk and deal with any merge conflicts.
    139 * Squash all commits in your change into one commit. This removes any false steps and re-working, and packages the related work together.
     136==== Squashing commits ====
    140137
    141138{{{