Permalink
Commits on Apr 25, 2012
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 Jan 2, 2012
  1. Add some example hook scripts.

    nvie committed Jan 2, 2012
  2. Call the hooks explicitly on a per-action basis, with positional

    arguments that are relevant for the action at hand.
    nvie committed Jan 2, 2012
  3. Refactor the code a bit.

    It now has explicit pre and post functions to communicate the difference
    in exit code handling.  Also, allow for passing in positional arguments
    that make sense on a per-action basis.
    nvie committed Jan 2, 2012
  4. Revert all whitespace changes.

    nvie committed Jan 2, 2012
  5. Makes the feature more compliant with nvie comments in #171

    Renames the called hooks to new proposed naming convention.
    Removes the configurable configuration/hooks directory. All hooks are to be stored in .git/hooks
    
    Signed-off-by: Peter van der Does <peter@avirtualhome.com>
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    petervanderdoes committed with nvie Jan 2, 2012
  6. Remove trailing whitespace

    Signed-off-by: Peter van der Does <peter@avirtualhome.com>
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    petervanderdoes committed with nvie Dec 24, 2011
  7. Add some documentation to the do_hook function

    Signed-off-by: Peter van der Does <peter@avirtualhome.com>
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    petervanderdoes committed with nvie Dec 24, 2011
  8. Add the pre and post hook calls.

    Signed-off-by: Peter van der Does <peter@avirtualhome.com>
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    petervanderdoes committed with nvie Dec 24, 2011
  9. Implements do_hook function

    Signed-off-by: Peter van der Does <peter@avirtualhome.com>
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    petervanderdoes committed with nvie Dec 24, 2011
  10. Rename the Hooks directory variable.

    Renamed so it won't be confused with the already present GITFLOW_DIR variable, which holds the dorectory info of where the gitflow scripts are located.
    
    Signed-off-by: Peter van der Does <peter@avirtualhome.com>
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    petervanderdoes committed with nvie Dec 24, 2011
  11. Add directory setup to the git flow init process

    git flow will fail when the directories are not setup in the git config.
    
    Signed-off-by: Peter van der Does <peter@avirtualhome.com>
    Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
    petervanderdoes committed with nvie Dec 24, 2011
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