Commits

Branch selector

 e9d2d04

User selector

All users

Datepicker

All time

Commit History

Commits on Feb 1, 2010

• Add TODO item for adding installation of shFlags, too.

  Show description for e9d2d04
  nvie

  committed
  e9d2d04

  Copy full SHA for e9d2d04

• Merge branch 'feature/verbose-feature-list' into develop

  nvie

  committed
  0a5c730

  Copy full SHA for 0a5c730

• Dynamically calculate maximal column width used in verbose feature list output.

  nvie

  committed
  1adbc3e

  Copy full SHA for 1adbc3e

• Add initial implementation of the --verbose flag algorithm.

  Show description for f2536f4
  nvie

  committed
  f2536f4

  Copy full SHA for f2536f4

• Merge branch 'feature/getopt' into develop

  nvie

  committed
  60d3d62

  Copy full SHA for 60d3d62

• Use shFlags to parse flags given to main and subcommands.

  Show description for 1b81923
  nvie

  committed
  1b81923

  Copy full SHA for 1b81923

Commits on Jan 30, 2010

• Added initial implementation of using shFlags.

  nvie

  committed
  ea58d0f

  Copy full SHA for ea58d0f

• Include shFlags repo as a Git submodule.

  Show description for 42600d9
  nvie

  committed
  42600d9

  Copy full SHA for 42600d9

Commits on Jan 29, 2010

• Merge branch 'feature/allow-prefixes-as-name-arg-on-finish' into develop

  nvie

  committed
  d3bc760

  Copy full SHA for d3bc760

• Fix one old occurence of gitflow_check_ -> gitflow_require_

  nvie

  committed
  7ae320b

  Copy full SHA for 7ae320b

• Fix one old occurence of gitflow_check_ -> gitflow_require_

  nvie

  committed
  1ee37e7

  Copy full SHA for 1ee37e7

• Document which subcommands may use the prefix.

  nvie

  committed
  ea60895

  Copy full SHA for ea60895

• Doesn't make sense to allow prefix names for commands that require $BRANCH to be absent.

  nvie

  committed
  8392ed3

  Copy full SHA for 8392ed3

• Further divide the parse_args function up, to support automatic prefix expansion for all subcommands, except for 'feature start'

  nvie

  committed
  22ef21a

  Copy full SHA for 22ef21a

• Implement the basic logic to resolve name prefixes passed to 'flow feature' into their full feature branch names, if unambiguous.

  nvie

  committed
  2e1856b

  Copy full SHA for 2e1856b

• Merge branch 'feature/merge-conflict-support' into develop

  nvie

  committed
  a0fe939

  Copy full SHA for a0fe939

• Support scenarios where the user might have cancelled a merge in the middle of a merge conflict.

  nvie

  committed
  f6f152f

  Copy full SHA for f6f152f

• Created a second function called gitflow_test_clean_working_tree() that returns error codes instead of dies.

  Show description for 62345d5
  nvie

  committed
  62345d5

  Copy full SHA for 62345d5

• Initial implementation of merge conflict resolution support.

  nvie

  committed
  49c7d02

  Copy full SHA for 49c7d02

• Include a globally available variable GIT_DIR, that points to the .git directory.

  Show description for 58995b5
  nvie

  committed
  58995b5

  Copy full SHA for 58995b5

• Merge branch 'feature/no-connectivity-for-feature-branches' into develop

  nvie

  committed
  17a8112

  Copy full SHA for 17a8112

• Make the 'to fetch or not to fetch' flag explicit in the other commands, too.

  Show description for 2acfffd
  nvie

  committed
  2acfffd

  Copy full SHA for 2acfffd

• Fix: respect the VERSION_PREFIX in hotfix releases, too.

  nvie

  committed
  57e7bde

  Copy full SHA for 57e7bde

• Fix: respect the VERSION_PREFIX in hotfix releases, too.

  nvie

  committed
  ab3dc49

  Copy full SHA for ab3dc49

• Only have network connectivity when explicitly asked for feature branches. This action is so common that it should be quick (very git-ish).

  Show description for e034e4a
  nvie

  committed
  e034e4a

  Copy full SHA for e034e4a

• Replace gitflow_check_ prefixes by gitflow_require_ prefixes, for consistency.

  nvie

  committed
  4838644

  Copy full SHA for 4838644

Commits on Jan 28, 2010

• Fix 'feature diff'

  nvie

  committed
  278884b

  Copy full SHA for 278884b

• Remove pointless check for existence of function setup()

  nvie

  committed
  92b125c

  Copy full SHA for 92b125c

• Merge branch 'feature/subcmd-structure' into develop

  Show description for 46e9c86
  nvie

  committed
  46e9c86

  Copy full SHA for 46e9c86

• Forgot list command for hotfixes.

  nvie

  committed
  04839ae

  Copy full SHA for 04839ae

• Remove double entry from README.

  nvie

  committed
  05caf02

  Copy full SHA for 05caf02

• Give all subcommands an optional setup() function that will be called by git-flow in order to let the subcommand initialize its environment.

  Show description for b866b01
  nvie

  committed
  b866b01

  Copy full SHA for b866b01

Commits on Jan 27, 2010

• refactor git config calls to global variables

  hollow

  committed
  49dd62b

  Copy full SHA for 49dd62b

• Remove double entry from README.

  nvie

  committed
  fb238a2

  Copy full SHA for fb238a2

• remove useless sanity check

  hollow

  committed
  7672d99

  Copy full SHA for 7672d99

Pagination

Previous

Next