Permalink
Switch branches/tags
Commits on Jun 8, 2012
Commits on Jun 7, 2012
  1. Auto-push before creating a pull-request

    danielbeardsley committed Jun 7, 2012
    mostly so you wont get an API error if you forget to push before hand
  2. Fix bug in feature finish

    danielbeardsley committed Jun 7, 2012
    and remove clean-working-tree requirement
Commits on Jun 6, 2012
Commits on Mar 23, 2012
  1. Fix hotfix bash completion

    danielbeardsley committed Mar 23, 2012
    remove 'hotfix-'
  2. Add bash completion support

    danielbeardsley committed Mar 23, 2012
    Simple bash completion support for command bnames and branch names (filtered
    appropriately for hotfix and feature branches).
Commits on Mar 20, 2012
  1. Added `feature pull` for pulling changes

    danielbeardsley committed Mar 20, 2012
    It does:
        git fetch
        git rebase --preserve-merges origin/...
    
    This replaces git pull and allows git pulling after doing a merge.
    
    Previously, git pull --rebase would rebase all commits reachable through the
    merge ontop of the current branch, effectively duplicating the commits in the
    history.
Commits on Mar 13, 2012
  1. Fix feature status

    danielbeardsley committed Mar 13, 2012
    It wasn't detecting incoming/outgoing correctly.  Added --boundary instead
    of using the ^ to indicate parent-of.
  2. Add Deployment section to README

    danielbeardsley committed Mar 13, 2012
    And get rid of deployment.rb as it was somewhat ifixit specific.
  3. Some small README fixes

    danielbeardsley committed Mar 13, 2012
  4. Add feature status

    danielbeardsley committed Mar 13, 2012
    Yeah, it rocks.  Though it could easily be abstracted to git.rb
    something like:
    def self.show_both_branches(branch1, branch2)
Commits on Mar 9, 2012
  1. Add `feature stashes -v`

    danielbeardsley committed Mar 9, 2012
    It shows all stashes on all branches instead of just the current one.
    Also add documentation for feature stashes.
  2. Make `feature-start` setup tracking branch on remote

    danielbeardsley committed Mar 9, 2012
    A single `git push -u` would do the same thing, but asking each user to do that
    the very first time they push would be silly. And automatically pushing every
    time they create a feature branch would also be silly.
Commits on Mar 7, 2012
  1. Have hotfix auto-pull before starting/finishing

    danielbeardsley committed Mar 7, 2012
    To ensure that further pushes to origin will not have conflicts
  2. Display hotfix help

    danielbeardsley committed Mar 7, 2012
  3. Have 'hotfix finish' dump you onto stable

    danielbeardsley committed Mar 7, 2012
    So that a git-push afterward will give you what you want.
Commits on Mar 5, 2012
Commits on Feb 20, 2012
Commits on Feb 8, 2012
Commits on Feb 6, 2012
  1. Add a comment

    danielbeardsley committed Feb 6, 2012