Skip to content

Commit

Permalink
Merge pull request #132 from kwasticat/develop
Browse files Browse the repository at this point in the history
Install script depends on Bash-only features, needs slight adjustment!
  • Loading branch information
nvie committed Jun 14, 2011
2 parents 14bcc58 + 26293bb commit 0191c68
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.mdown
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ If you're on a Mac and use [MacPorts](http://macports.org/), it's simple:
Another easy way to install git-flow is using Rick Osborne's excellent git-flow
installer, which can be run using the following command:

$ wget --no-check-certificate -q -O - https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | sudo sh
$ wget --no-check-certificate -q -O - https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | sudo bash

### Windows

Expand All @@ -46,7 +46,7 @@ For Windows users who wish to use the automated install, it is suggested that yo
first to install tools like `git`, `util-linux` and `wget` (with those three being packages that can be selected
during installation). Then simply run this command from a Cygwin shell:

$ wget -q -O - https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | sh
$ wget -q -O - https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash

#### Using [msysgit](http://code.google.com/p/msysgit/)
Download and install `getopt.exe` from the [util-linux package](http://gnuwin32.sourceforge.net/packages/util-linux-ng.htm) into `C:\Program Files\Git\bin`. (Only `getopt.exe`, the others util-linux files are not used).
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitflow-installer.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

# git-flow make-less installer for *nix systems, by Rick Osborne
# Based on the git-flow core Makefile:
Expand Down

0 comments on commit 0191c68

Please sign in to comment.