Permalink
Commits on Feb 14, 2012
  1. Merge branch 'debian-installer' into develop

    Conflicts:
    	README.mdown
    nvie committed Feb 14, 2012
Commits on Feb 13, 2012
  1. Update the Changelog.

    nvie committed Feb 13, 2012
  2. set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly

    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    bloveridge committed with nvie Jan 6, 2012
  3. Remove the "still maintained" banner.

    This is done in anticipation of their discontinuing service.
    nvie committed Feb 13, 2012
  4. Add Vedang to AUTHORS.

    nvie committed Feb 13, 2012
  5. Fix indenting.

    nvie committed Feb 13, 2012
  6. Added a -r flag to git-flow-feature-pull to support pull with rebase

    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    vedang committed with nvie Jan 30, 2012
  7. Merge pull request #160 from Zoramite/feature/Issue50

    Adding the `eval` to force variable expansion.
    nvie committed Feb 13, 2012
  8. Merge pull request #178 from lorin/feature/docs

    Documented init -d flag and feature publish/pull
    nvie committed Feb 13, 2012
  9. Merge pull request #195 from Zoramite/feature/Issue148

    Updating the escape characters to fix + in the branch name
    nvie committed Feb 13, 2012
Commits on Feb 8, 2012
  1. Updating the escape characters to fix an issue with having a + in the…

    … branch name.
    
    Since git allows for it the escape should not escape it since it then won't match the branch names correctly.
    Zoramite committed Feb 8, 2012
Commits on Dec 20, 2011
  1. whitespace

    Lorin Hochstein committed Dec 20, 2011
  2. Documented init -d flag and publish/pull

    Documented the -d flag for init command
    
    Added docs for feature push and feature pull
    Lorin Hochstein committed Dec 20, 2011
Commits on Dec 6, 2011
  1. Moved all installation instructions to the Wiki.

    There were becoming so large they were muddling the README.
    nvie committed Dec 6, 2011
  2. Merge pull request #173 from AlexZeitler/patch-1

    Updated Cygwin section with possibly missing package.
    nvie committed Dec 6, 2011
  3. Updated Cygwin section with possibly missing package.

    Alexander Zeitler committed Dec 6, 2011
  4. Merge pull request #172 from sjaeckel/develop

    fixed the installer in msysgit environment to work with windows XP
    nvie committed Dec 6, 2011
  5. fixed the installer in msysgit environment to work with windows XP

    as the command 'choice' is not available on Windows XP we have to work around
    this issue by usage of 'set /p'
    sjaeckel committed Dec 6, 2011
Commits on Dec 1, 2011
  1. Oops, forgot about spaces in the dirname.

    Quite likely for Windows users to hit this problem.
    nvie committed Dec 1, 2011
Commits on Nov 30, 2011
  1. Add a proposal for our Windows users.

    Will this help you guys out?
    nvie committed Nov 30, 2011
  2. Rewrote Eric's text a bit.

    nvie committed Nov 30, 2011
Commits on Nov 29, 2011
  1. Add --recursive.

    ejholmes committed Nov 29, 2011
  2. Check if a remote master branch exists before die, track it if no loc…

    …al master branch exists
    ejholmes committed Nov 29, 2011
Commits on Nov 28, 2011
  1. develop_branch uses origin/develop_branch as start-point if one exists.

    By default a local develop branch is created of from master regardless if a origin/develop exits. This problem is discussed in issues #137 and #23.
    emreberge committed Nov 28, 2011
Commits on Nov 24, 2011
Commits on Nov 23, 2011
  1. Merge pull request #163 from phoet/publish_hotfix

    add publishing to hotfix
    
    Thanks, pulled.
    nvie committed Nov 23, 2011
  2. Merge branch 'chad3814-develop' into develop

    Thanks, chad3814.
    nvie committed Nov 23, 2011
  3. Fix wording.

    nvie committed Nov 23, 2011