Changes between Version 6 and Version 7 of Developer/Git/Committers

Timestamp:

03/01/12 20:49:52 (12 years ago)

Author:

Gedare

Comment:

/* Update from upstream master (RTEMS head) */

Developer/Git/Committers

@@ -86 +86 @@
  # git merge upstream/master
 }}}
-This is the same as a git pull. When you have committed changes on a branch that is private (hasn't been pushed to your personal repo) then you can use rebase to obtain a linear history.
+This is the same as a ''git pull''. When you have committed changes on a branch that is private (hasn't been pushed to your personal repo) then you can use rebase to obtain a linear history and avoid merge commit messages.
 {{{
 # git checkout new_features
@@ -92 +92 @@
 # git rebase upstream/master
 }}}
-When you have committed changes on a branch that is public you should not rebase that branch. TODO: what to do...
+This is the same as a ''git pull -rebase''.
+
+When you have committed changes on a branch that is public/shared with another developer you should not rebase that branch. TODO: what to do...
 =  GIT Push Configuration  =