OpenHatch git workflow
Some guidelines on how to use git when working on OpenHatch
Getting a new clone of OpenHatch
Only need to do this once. Or if you want to start form scratch.
It is also good (okay) to remove your oh-mainline directory
and start over if you aren't sure the state of your OpenHatch repository.
$ git clone git://github.com/openhatch/oh-mainline.git
Committing a patch
- After you have already retreived your respository of code. And you have made some changes, now you need to submit your patch (that will contain your changes) for review to OpenHatch.
git statusgit add <file(s)>git commit -m "Short message explaining your fix"git log -p(opens in less editor)git format-patch origin/master
- Now git any updates that may have occurred since you last did a
git cloneor agit fetchgit fetchgitkgit rebase origin/mastergit log
Note: The git log and gitk commands aren't modifying your patch, these commands are run to track your changes, and see what state your patch is in, in comparison to the origin
Submitting a patch
Find your patch file that has been generated from the git format-patch command. In your current directory you can run
ls -lrt which will list your files in time-sort order. Listing the
newest modified files at the bottom. Look for the file similar to
0002-Updated-the-default-case-for-people-search-AllTagsQu.patch. This file
or these files will need to be added to the bug tracker... if we are still doing this.
The alternative is just using github, which some people are starting to look into.
Other useful commands
git rebase -i origin/master-- to combine patches into one. after which re-run format-patch command. notice "-i"git diff -pgit rmgit -u