Changes between Version 1 and Version 2 of CommittingYourChanges


Ignore:
Timestamp:
07/01/15 10:42:17 (6 years ago)
Author:
jdreed
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • CommittingYourChanges

    v1 v2  
    44* ensure you have [wiki:WorkingWithGithub set up your fork and remote] for the module you're working on. 
    55* ensure you have read [wiki:WorkingWithTheRepository], especially the part on native vs non-native packages, deatched HEADs, and branches. 
     6 
     7**NOTE**: This document assumes that the remote named `origin` is the repository on `git.mit.edu`. 
    68 
    79== Native Packages == 
     
    2022* Tag your most recent commit with the version number (this MUST match the version number as described above). 
    2123 * `git tag -a 10.0.3 a4b5c6d7` 
    22 * Push your master, and the tag to `origin` (`git+ssh://git.mit.edu/[...]`). 
     24* Push your master, and the tag to `origin`. 
    2325 * `git push origin master` 
    2426 * `git push origin 10.0.3` 
     
    3840* Push to `origin`: 
    3941 * `git push origin debian` 
     42 
     43== Native Packages == 
     44 
     45Reminder: Native packages have a single `master` branch, and are **not** tagged at commit time. 
     46 
     47* Make your changes to the code, and commit them. 
     48* Ensure you update the `debian/changelog` file with a new entry for the new version.  Unlike non-native packages, version strings should just be numbers (e.g. 1.5.7). 
     49* Commit your changes, and push them to **your** remote.  Submit a pull request as [wiki:WorkingWithGithub described here], and wait for code review, or decide that this is important enough that it doesn't need code review. 
     50 
     51* Once your pull request is approved, push to `origin`: 
     52 * `git push origin master`