Changes between Version 79 and Version 80 of DeveloperGuidelines/Git

Timestamp:

01/02/14 09:45:29 (11 years ago)

Author:

Pat Tressel

Comment:

--

DeveloperGuidelines/Git

@@ -49 +49 @@
 
 # Commit Code (Note, no pushes to GitHub here)
-git commit -am "My Story: Part 1"
+git commit -am "My Changes: Part 1"
 .
 .
 .
-git commit -am "My Story: Part N"
+git commit -am "My Changes: Part N"
 
 # Pull in changes from trunk
@@ -67 +67 @@
 git log
 
+# Squash commits
 # Use rebase to squash commits to as few as possible to keep revision history clean & make it easier to review the work
 # http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
-git rebase -i HEAD~N # Where N = Number of commits 
+git rebase -i HEAD~N # Where N = Number of commits to squash
 
 # Push to your branch on GitHub