Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: develop

Aug 21, 2010

  1. Vincent Driessen

    Bugfix to avoid errors due to Git subcommands returning ANSI color ou…

    …tput.
    nvie authored

Aug 20, 2010

  1. JP Toto

    Fixed link to Cygwin and msysgit

    jptoto authored nvie committed
  2. JP Toto

    Added installation instructions for Windows users

    jptoto authored nvie committed

Aug 19, 2010

  1. Vincent Driessen

    Make the links manually.

    I thought Markdown did support URL recognition automatically.
    nvie authored
  2. Vincent Driessen

    Mention Jeff's great article on the README file.

    nvie authored

Jul 22, 2010

  1. Vincent Driessen

    Merge branch 'release/0.3' into develop

    Conflicts:
    	git-flow-version
    nvie authored
  2. Vincent Driessen

    Bump version to 0.4-dev.

    nvie authored
  3. Vincent Driessen

    Bump version to 0.3.

    nvie authored
  4. Vincent Driessen

    Fix minor markdown issue and credit contributers.

    nvie authored
  5. Vincent Driessen

    Add a Changelog, for keeping a clean overview of what changed.

    nvie authored
  6. Vincent Driessen

    Change the default behaviour of all scripts to NOT fetch.

    This already was the default behaviour of git-flow-feature, but now it
    is the default for the other scripts, too.
    
    RATIONALE: Due to limitations on some platforms (and some
    implementations of getopt), it's impossible to turn off the -f (fetch)
    option.  Therefore, it must now be set explicitly.
    
    Also, this makes git-flow work in stand-alone repositories (i.e. repos
    that do not have an origin remote at all).
    nvie authored
  7. Vincent Driessen

    Add link to git-flow-completion project.

    Also, invite users to help out on the git-flow completion for zsh.
    Personal itch that needs some serious scratching :)
    nvie authored
  8. Vincent Driessen

    Remove "important" 0.2 message.

    It disturbs the layout of the README file and nobody uses 0.1 anymore
    anyway.  At least I hope (for them).
    nvie authored

Jul 21, 2010

  1. Vincent Driessen

    Add Mark to AUTHORS.

    nvie authored
  2. Vincent Driessen

    Fix whitespace issues.

    nvie authored

Jul 20, 2010

  1. Mark Derricutt

    Finishing features now only update / and / if they exists, this allow…

    …s you to work on a unpushed repo, or a git svn repo
    talios authored

Jul 16, 2010

  1. Vincent Driessen

    Fix markdown issue.

    nvie authored
  2. Vincent Driessen

    Added link to Google group.

    nvie authored

Jul 11, 2010

  1. Vincent Driessen

    Bumped version number to 0.3-dev

    Should have done this way earlier on the develop branch.
    nvie authored

Jul 10, 2010

  1. Vincent Driessen

    Added Rick Osborne's super-easy gitflow installer oneliner to the pro…

    …ject.
    
    See the README file for instructions on how to use it.
    nvie authored

Jul 09, 2010

  1. Vincent Driessen

    Added new experimental `feature pull` subcommand.

    This new subcommand lets you easily work together with peers on features. It's
    intended to be extremely simple to pull changes from your co-developers.
    
    This implementation may also be ported to release and/or hotfix branches in the
    near future, if we agree on the final implementation details.
    
    Example use
    ===========
    Sharing development of feature branches goes as follows:
    
    Suppose Alice and Bob are both developers on project Foo.  They have local
    repos that are up-to-date with `origin`.  Then, Alice starts working on some
    feature:
    
       alice$ git flow feature start newprotocol
       Switched to a new branch 'feature/newprotocol'
       ...
    
    Then, she hacks on the new feature, commits as desired, until the feature's
    finished.  She then likes Bob to code-review the feature, so she asks Bob to
    pull from her.  (Assuming Bob has a Git remote defined, pointing to Alice's
    repo.)
    
        bob$ git remote
        alice
    
        bob$ git branch
        * develop
          feature/reader
          master
    
        bob$ git flow feature pull alice newprotocol
        Created local branch feature/newprotocol based on alice's feature/newprotocol.
    
        bob$ git branch
          develop
        * feature/newprotocol
          feature/reader
          master
    
    Since the new feature branch is already checked out, Bob can immediately start
    peer reviewing the code.  He changes the code as desired and commits each
    comment individually, so Alice can later read the Git commit log as the peer
    review log.
    
        bob$ git commit
        [feature/newprotocol 1f6fa95] Forgot return statement.
         1 files changed, 1 insertions(+), 1 deletions(-)
        ...
    
    When he's finished, he tells Alice he's done.  Alice then, in turn pulls in the
    peer review commits from Bob, using the same command Bob used to fetch the
    changes initially.  (Because feature/newprotocol is still her current branch,
    she may omit the explicit 'newprotocols' argument.)
    
        alice$ git flow feature pull bob
        Pulled bob's changes into feature/newprotocol.
    
    If she disagrees with Bob's comments, she may again commit changes and ask Bob
    to do the same again.  This leads to a continuous pull cycle until both parties
    agree on the final implementation.  Then, Alice (as the feature owner) finished
    the feature.  Bob may discard his feature branch.
    nvie authored
  2. Vincent Driessen

    Change the URL of the original blog post.

    nvie authored
  3. Vincent Driessen

    Forgot to update usage text.

    nvie authored
  4. Vincent Driessen

    Allow new feature branches in dirty working trees.

    Before this change, `git-flow feature start` would nag about the working
    tree being dirty and disallow continuation. Then, there were two
    alternatives:
    
    - stash away your changes manually, create the new branch, restore the
      stash; or
    - use `git-flow feature start -f` to force creation
    
    There is absolutely no good reason for git-flow to forbid this creation,
    as git allows it already.  Therefore, the -f behaviour is now the default,
    without an option to turn that behaviour off.  Git takes care of unsafe
    situations again now.
    nvie authored

Jul 08, 2010

  1. Vincent Driessen

    Force deletion of the feature branch after finish.

    This fix also works when feature branches are created manually, based on remote
    (i.e. other developers) feature branches, to work on features together.
    
    `git branch -d` won't remove local feature branches that are set up to track
    remote branches, `-D` will.
    
    Fixes ticket #31.
    nvie authored
  2. Vincent Driessen

    Forgot to mention Jason L. Shiffer in AUTHORS file.

    Sorry!
    nvie authored

Jul 05, 2010

  1. Vincent Driessen

    Added Randy Merrill to the AUTHORS.

    nvie authored

Jun 29, 2010

  1. Randy Merrill

    Adding an extra line to the output for extra spacing.

    Zoramite authored nvie committed
  2. Randy Merrill

    Adding extra instructions when running the list option without any co…

    …rresponding branches found.
    Zoramite authored nvie committed

May 27, 2010

  1. Vincent Driessen

    Added alias 'co' for new 'checkout' subcommand.

    nvie authored
  2. Vincent Driessen

    Fix: incorrect order of arguments in determining whether local branch…

    … exists.
    nvie authored
  3. Vincent Driessen

    Added 'feature checkout' subcommand.

    This can be used as a shortcut to "git checkout feature/full-feature-name".
    Feature branch prefix names may be used for convenience.
    nvie authored

Apr 04, 2010

  1. Vincent Driessen

    Fix: unnecessary requirement of origin when creating a new feature br…

    …anch.
    
    Only test if local branch is behind origin if origin exists.
    nvie authored
  2. Vincent Driessen

    Added referral link to the AUTHORS file.

    nvie authored
  3. Vincent Driessen

    Added inline license terms to all source files.

    nvie authored
Something went wrong with that request. Please try again.