jonseymour/git - a fork of git.
git://github.com/jonseymour/git is my public fork of the git repo.
No attempt is made to keep any of the branches stable. If you want stability, please use one of the published tags, but be prepared to rebase your work later.
Obviously, this policy will change if and when I get any active collaborators.
- The base of my working branch. Contains my stabilised dependencies. Does not contain my unpublished work in progress. Rebuilt occasionally if and when topic branches are rebased. Not suitable for use as an upstream.
Contains the current iteration of four proposed git commands I find useful - git work, git base, git test and git atomic. For details about this work, refer to the man pages:
This branch will be rebuilt as the patch series is reworked.
Please note also, this is just a proposal at this stage. It may yet not be accepted for inclusion in git.
- Contains this documentation. Maintained as a separate topic so that it doesn't infect topics I may want to deliver.
- A copy of the patch series I mailed to the git list on 2011/04/23.
- A snapshot of work branch used to build v0.0.0 of the gitwork package. See gitwork for more details about this package.
HOW I MAINTAIN THIS DOCUMENT
When ever I edit this document, I do:
git add README.md git commit -m "Updates to README" git work update jonseymour HEAD~1 # updates jonseymour with the last commit, # merges that commit with $(git base) # rebases remaining unpublished work on that git push public $(git base):master jonseymour:jonseymour # updates github with my (relatively) stable work
The net effect is that:
- My changes to README.md go to my jonseymour branch.
- My public github branch reflects the work I have stabilised with git work update - it contains my stable dependencies, but not work in progress.
- I keep my work in progress rebased on top of my public github master branch.
- I keep my unpublished work private.
- My working tree remains stable - git work update doesn't change the tree, it only changes the history.