Permalink
Commits on Feb 6, 2011
  1. Add some changelog notes.

    nvie committed Feb 6, 2011
  2. Rewrite Joseph Levin's solution a bit.

    Thanks Joseph! I've added you to the AUTHORS file, too.
    nvie committed Feb 5, 2011
Commits on Feb 5, 2011
  1. Merge pull request #99 from josephalevin/gitflow

    ---
    
    Not sure if its of interest to you, but I implemented a --defaults flag in git-flow-init so the script doesnt have to prompt for branch names.  My goal is to now make a change in my gitolite install so every new rep is initialized with the git flow model.  Resolves issue 88.
    
    Great work on git-flow.  Im really liking it.
    
    Joseph
    nvie committed Feb 5, 2011
  2. Issue: 88

    Added support for using defaults without prompts when using git flow init.
    josephalevin committed Feb 5, 2011
Commits on Feb 4, 2011
  1. Escape characters from tags that have special meaning in grep.

    In particular, this fixes the case where a dot in a version name (not
    too uncommon ;)) unintentionally matches a pre-existing tag.  For
    example, if these tags exist:
    
        1.0.1
        1.0b2
    
    And you try to start a new release for 1.0.2, git-flow prevented it,
    since the '.' matches the 'b' in 1.0b2.  This resulted in the invalid
    error message:
    
        Tag '1.0.2' already exists. Pick another name.
    nvie committed Feb 4, 2011
  2. This patch prevents silent failure of the auto-installer.

    Original commit message:
    Allows wget to work rather than failing silently.  The actual error is
    "ERROR: certificate common name `*.github.com' doesn't match requested
    host name `github.com'."  Tested on Ubuntu 10.10.  Not tested on
    Windows, so I haven't changed that line.
    
    Signed-off-by: Vincent Driessen <vincent@datafox.nl>
    raybec committed with nvie Dec 6, 2010
Commits on Feb 3, 2011
  1. Fix: "eval set" called in the wrong context.

    This is the real fix for the incorrect fix that I reverted in the
    previous commit.  parse_cmdline was used to DRY up the source, but this
    introduced a bug because the "eval set" line changes the positional
    parameters semantics, but does it in the wrong context, so the calling
    function never receives the changes.
    
    This closes at least the GitHub issues #54 and #86.
    nvie committed Feb 3, 2011
  2. Don't just take the last argument, take the first.

    This patch was originally contributed as a workaround for the cases
    where there were flags that took the first argument position.  This fix
    was just plain wrong and this commit reverts it.
    nvie committed Feb 3, 2011
Commits on Jan 31, 2011
  1. Move up the "getting started" paragraph. It's the most important one

    that should be on top.
    nvie committed Jan 31, 2011
  2. Add links to the great screen casts on git-flow to the README.

    Thanks Mark and David!
    nvie committed Jan 31, 2011
Commits on Dec 6, 2010
  1. Fix placement.

    nvie committed Dec 6, 2010
  2. Add stillmaintained link.

    nvie committed Dec 6, 2010
Commits on Dec 2, 2010
  1. fixed typo

    sos4nt committed with nvie Dec 2, 2010
Commits on Nov 11, 2010
Commits on Nov 3, 2010
  1. Fix issue 34: "release finish" error: bad variable name.

    On some systems, /bin/sh is a symlink to dash. "local" here wants to
    create variables for multiple words on the line. Added quotes so that
    these are not treated as multiple variables.
    bstpierre committed Nov 3, 2010
Commits on Nov 2, 2010
  1. Adding more detailed installation information for Windows users on Cy…

    …gwin and msysgit
    agross committed with nvie Nov 2, 2010
Commits on Oct 31, 2010
  1. Fix FAQ link.

    nvie committed Oct 31, 2010
Commits on Oct 25, 2010
  1. Move the FAQ over to the Wiki on Github.

    I hope this makes it easier for people to contribute to git-flow.
    nvie committed Oct 25, 2010
Commits on Oct 20, 2010
Commits on Oct 18, 2010
  1. Update changelog for this release.

    nvie committed Oct 18, 2010
  2. Bump the version number.

    nvie committed Oct 18, 2010
  3. Tell getopt to parse POSIX compatible.

    By setting the environmental variable POSIXLY_CORRECT, getopt behaves
    strictly POSIX-compatible.  This fixes the incorrect getopt parsing
    style that breaks git-flow in several flavours of Linux.
    
    Many thanks to Thiana for figuring this one out.
    
    This should fix issues #28 and #29.
    nvie committed Oct 18, 2010
Commits on Oct 8, 2010
  1. Made a note on the apt-get installer's package name.

    This fixes issue #59.
    nvie committed Oct 8, 2010
  2. Manually select the last argument.

    This implementation does not rely on Bash-specific functionality.
    nvie committed Oct 8, 2010
Commits on Oct 5, 2010
  1. Allow finishing release branches without creating a tag.

    This is useful for small projects.
    nvie committed Oct 5, 2010
  2. Don't stop the script when the release branch is the current branch.

    Simply step aside to the master branch instead.
    nvie committed Oct 5, 2010
  3. Tidy up a bit.

    nvie committed Oct 5, 2010
  4. Changed versiontag prefix to allow addition of dynamic data (i.e. date)

    For example, you could set the versiontag prefix to be:
    
        git config --global gitflow.prefix.versiontag "production/\$(date +%Y/%m/%d/)"
    
    which would result in tag names like:
    
        production/2010/09/22/my-hotfix-or-feature-name
    
    NOTE:
    Although this is a useful addition in the current version of git-flow,
    in a future reimplementation of it in Python, this will be replaced by
    hook scripts, so be sure not to rely on this feature too much for now.
    nowells committed with nvie Sep 22, 2010
  5. Added -k option to keep (feature|hotfix|relase) branch when calling '…

    …finish'.
    Guillaume-Jean Herbiet committed with nvie Oct 4, 2010
  6. Rename the helper function.

    nvie committed Oct 5, 2010