Permalink
Switch branches/tags
Nothing to show
Commits on Feb 14, 2011
  1. Update the changelog.

    nvie committed Feb 14, 2011
  2. Bump the version number.

    nvie committed Feb 14, 2011
Commits on Feb 11, 2011
  1. I only just discovered the --recursive flag to git clone.

    nvie committed Feb 11, 2011
    Using --recursive simplifies instructions related to the submodule
    initialization for shFlags.
Commits on Feb 6, 2011
  1. Add some changelog notes.

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

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

    nvie committed Feb 5, 2011
    ---
    
    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
  2. Issue: 88

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

    nvie committed Feb 4, 2011
    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.
  2. This patch prevents silent failure of the auto-installer.

    raybec authored and nvie committed Dec 6, 2010
    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>
Commits on Feb 3, 2011
  1. Fix: "eval set" called in the wrong context.

    nvie committed Feb 3, 2011
    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.
  2. Don't just take the last argument, take the first.

    nvie committed Feb 3, 2011
    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.
Commits on Jan 31, 2011
  1. Move up the "getting started" paragraph. It's the most important one

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

    nvie committed Jan 31, 2011
    Thanks Mark and David!
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 authored and nvie committed Dec 2, 2010
Commits on Nov 11, 2010
Commits on Nov 3, 2010
  1. Fix issue 34: "release finish" error: bad variable name.

    bstpierre committed Nov 3, 2010
    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.
Commits on Nov 2, 2010
  1. Adding more detailed installation information for Windows users on Cy…

    agross authored and nvie committed Nov 2, 2010
    …gwin and msysgit
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.

    nvie committed Oct 25, 2010
    I hope this makes it easier for people to contribute to git-flow.
Commits on Oct 20, 2010
Commits on Oct 18, 2010
  1. Bump the version number.

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

    nvie committed Oct 18, 2010
    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.
Commits on Oct 8, 2010
  1. Made a note on the apt-get installer's package name.

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

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

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

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

    nvie committed Oct 5, 2010