Commits

Branch selector

 develop

User selector

All users

All time

Commit History

Commits on Mar 14, 2012

• Merge branch 'feature/msysInstall' into develop

  sjaeckel

  committed
  1eb8a46

  Copy full SHA for 1eb8a46

• make the installer for msysgit search in ~/bin as well

  sjaeckel

  committed
  51011ac

  Copy full SHA for 51011ac

Commits on Feb 29, 2012

• Merge remote-tracking branch 'bloveridge/feature/backmerge' into develop

  sjaeckel

  committed
  51ee558

  Copy full SHA for 51ee558

Commits on Feb 28, 2012

• also backmerge hotfix branches, with a flag avoid doing so

  putermancer

  committed
  40c5c75

  Copy full SHA for 40c5c75

Commits on Feb 23, 2012

• Merge remote-tracking branch 'bloveridge/feature/backmerge' into develop

  sjaeckel

  committed
  e2889d4

  Copy full SHA for e2889d4

Commits on Feb 14, 2012

• Merge branch 'debian-installer' into develop

  Show description for ab7fda2
  nvie

  committed
  ab7fda2

  Copy full SHA for ab7fda2

Commits on Feb 13, 2012

• Update the Changelog.

  nvie

  committed
  cc5e9a5

  Copy full SHA for cc5e9a5

• set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly

  Show description for f608281
  

  putermancer

  authored and

  nvie

  committed
  f608281

  Copy full SHA for f608281

• Remove the "still maintained" banner.

  Show description for 679f05f
  nvie

  committed
  679f05f

  Copy full SHA for 679f05f

• Add Vedang to AUTHORS.

  nvie

  committed
  53cfc35

  Copy full SHA for 53cfc35

• Fix indenting.

  nvie

  committed
  7384052

  Copy full SHA for 7384052

• Added a -r flag to git-flow-feature-pull to support pull with rebase

  Show description for 56bff9a
  

  vedang

  authored and

  nvie

  committed
  56bff9a

  Copy full SHA for 56bff9a

• Merge pull request #160 from Zoramite/feature/Issue50

  Show description for adfd408
  nvie

  committed
  adfd408

  Copy full SHA for adfd408

• Merge pull request #178 from lorin/feature/docs

  Show description for bb1becd
  nvie

  committed
  bb1becd

  Copy full SHA for bb1becd

• Merge pull request #195 from Zoramite/feature/Issue148

  Show description for ee27210
  nvie

  committed
  ee27210

  Copy full SHA for ee27210

Commits on Feb 8, 2012

• Merge branch 'develop' into feature/Issue50

  Zoramite

  committed
  f66eba8

  Copy full SHA for f66eba8

• Updating the escape characters to fix an issue with having a + in the branch name.

  Show description for afbf92c
  Zoramite

  committed
  afbf92c

  Copy full SHA for afbf92c

Commits on Dec 20, 2011

• add short flag for turning on nobackmerge

  putermancer

  committed
  595a992

  Copy full SHA for 595a992

• Do the backmerge by default

  

  gvangool

  authored and

  putermancer

  committed
  8879745

  Copy full SHA for 8879745

• make back-merging of the production branch into develop optional, and default it to false -- this preserves original functionailty by default

  putermancer

  committed
  fddaac5

  Copy full SHA for fddaac5

• merge master into develop when finishing a release. If tag, merge the tag; if notag, merge the master branch. This subtly changes the merge message to align with what flags were provided.

  putermancer

  committed
  e640746

  Copy full SHA for e640746

• whitespace

  

  Lorin Hochstein

  committed
  905cfb1

  Copy full SHA for 905cfb1

• Documented init -d flag and publish/pull

  Show description for 5a58633
  

  Lorin Hochstein

  committed
  5a58633

  Copy full SHA for 5a58633

Commits on Dec 6, 2011

• Moved all installation instructions to the Wiki.

  Show description for 07dacd5
  nvie

  committed
  07dacd5

  Copy full SHA for 07dacd5

• Merge pull request #173 from AlexZeitler/patch-1

  Show description for e8c88c0
  nvie

  committed
  e8c88c0

  Copy full SHA for e8c88c0

• Updated Cygwin section with possibly missing package.

  

  Alexander Zeitler

  committed
  c02c12d

  Copy full SHA for c02c12d

• Merge pull request #172 from sjaeckel/develop

  Show description for 6107f88
  nvie

  committed
  6107f88

  Copy full SHA for 6107f88

• fixed the installer in msysgit environment to work with windows XP

  Show description for e856e0a
  sjaeckel

  committed
  e856e0a

  Copy full SHA for e856e0a

Commits on Dec 1, 2011

• Merge branch 'feature/convert-slashes' into develop

  nvie

  committed
  72594ea

  Copy full SHA for 72594ea

• Better support for the Windows platform, where backslashes are dominant.

  nvie

  committed
  083a588

  Copy full SHA for 083a588

• Oops, forgot about spaces in the dirname.

  Show description for 5e8cc9f
  nvie

  committed
  5e8cc9f

  Copy full SHA for 5e8cc9f

Commits on Nov 30, 2011

• Add a proposal for our Windows users.

  Show description for 4b9545e
  nvie

  committed
  4b9545e

  Copy full SHA for 4b9545e

• Merge branch 'develop' of github.com:nvie/gitflow into develop

  nvie

  committed
  b4626cb

  Copy full SHA for b4626cb

• Rewrote Eric's text a bit.

  nvie

  committed
  49305ec

  Copy full SHA for 49305ec

Commits on Nov 29, 2011

• Add Eric Holmes to list of contributors.

  nvie

  committed
  921ddf5

  Copy full SHA for 921ddf5