Changes between Version 2 and Version 3 of Developer/Git/Users


Ignore:
Timestamp:
Mar 4, 2012, 10:39:30 PM (8 years ago)
Author:
Gedare
Comment:

/* Creating a Patch */

Legend:

Unmodified
Added
Removed
Modified
  • Developer/Git/Users

    v2 v3  
    248248= Creating a Patch =
    249249
    250 The easiest way to create a patch is to make and commit changes in a branch and then use either diff or format-patch comparing against the upstream master branch. (Of course, if the patch is supposed to be against a different branch then you should substitute that branch's name for master.)
    251 {{{
    252  git diff master..HEAD > ../rtems.diff
    253 }}}
    254 Creates a diff containing the changes made in the current branch's commits since the master branch. Here I redirected the output to a file in the parent directory.
    255 {{{
    256  git format-patch master
    257 }}}
    258 Creates a separate patch for each commit that has been made between the master branch and the current branch's head. These files, appended with .patch, are formatted so they can be emailed and rely on having git configured with your name and email address, for example
    259 {{{
    260  git config --global user.name "Your Name"
    261  git config --global user.email name@domain.com
    262 }}}
    263 
    264 Submit your patch to the [wiki:RTEMSMailingLists_  rtems-devel mailing list] and if the patch fixes a bug, file a PR on the [wiki:Bugzilla Bugzilla].
     250To contribute to RTEMS see [wiki:Developer/Contributing Contributing]
    265251=  Troubleshooting  =
    266252