Changes between Version 29 and Version 30 of Developer/Git


Ignore:
Timestamp:
Feb 3, 2012, 10:35:43 PM (8 years ago)
Author:
Gedare
Comment:

/* GIT Access for users */

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git

    v29 v30  
    208208 git branch -d branch2
    209209}}}
     210= Rebasing =
     211
     212An alternative to the merge command is rebase, which replays the changes (commits) on one branch onto another. git rebase finds the common ancestor of the two branches, stores each commit of the branch you’re on to temporary files, and applies each commit in order.
     213
     214Rebasing makes a cleaner history than merging; the log of a rebased branch looks like a linear history as if the work was done serially rather than in parallel. A primary reason to rebase is to ensure commits apply cleanly on a remote branch, e.g. when submitting patches to RTEMS that you create by working on a branch in a personal repository. Using rebase to merge your work with the remote branch eliminates most integration work for the committer/maintainer.
     215
     216There is one caveat to using rebase: Do not rebase commits that you have pushed to a public repository. Rebase abandons existing commits and creates new ones that are similar but different. If you push commits that others pull down, and then you rewrite those commits with git rebase and push them up again, the others will have to re-merge their work and trying to integrate their work into yours can become messy.
    210217= Creating a Patch =
    211218
     
    224231}}}
    225232
    226 See the [wiki:Bugzilla Bugzilla] page for information about submitting patches to RTEMS.
     233Submit your patch to the [http://wiki.rtems.org/wiki/index.php/RTEMSMailingLists | rtems-devel mailing list] and if the patch fixes a bug, file a PR on the [wiki:Bugzilla Bugzilla].
    227234=  GIT Access for contributors  =
    228235