livebuzz-gitx

Build Status Code Climate

Useful Git eXtensions for Development workflow at LiveBuzz.

Based on TheGarage-GitX and socialcast-git-extensions

Git Extensions for Workflow

Options

  • --trace or -v = verbose output for debugging commands
  • --pretend or -p = dry run commands and do not actually invoke operations

git start

update local repository with latest upstream changes and create a new feature branch

git update

update the local feature branch with latest remote changes plus upstream released changes.

git integrate

integrate the current feature branch into an aggregate branch (ex: prototype, staging)

git release

release the current feature branch to master. This operation will perform the following:

  • pull in latest code from remote branch
  • merge in latest code from master branch
  • prompt user to confirm they actually want to perform the release
  • merge current branch into master
  • (optional) cleanup all merged branches from remote server

options:

  • --cleanup = automatically cleanup all merged branches after release complete

Extra Utility Git Extensions

git cleanup

delete all released branches that have been merged into master.

git nuke

reset an aggregate branch (ex: prototype, staging) back to a known good state.

git buildtag

create a build tag for the current build and push it back to origin

Note on Patches/Pull Requests

  • Fork the project.
  • Make your feature addition or bug fix.
  • Add tests for it. This is important so I don't break it in a future version unintentionally.
  • Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
  • Send me a pull request. Bonus points for topic branches.

Copyright (c) 2015 LiveBuzz Ltd. See LICENSE for details.