Changes between Version 80 and Version 81 of DeveloperGuidelines/Git

Timestamp:

01/02/14 11:23:36 (11 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -134 +134 @@
 
 
-==== Rebasing after pushing to !GitHub ====
-Squash your commits if they are not in between two executions of git pull or git merge:
+==== Squashing and rebasing commits ====
+Before submitting code to be included in the trunk repository, two things should be done:
+* Rebase from trunk and deal with any merge conflicts.
+* Squash all commits in your change into one commit. This removes any false steps and re-working, and packages the related work together.
 
 {{{