Update README for msysgit to use the new installer
diff --git a/README.mdown b/README.mdown
index 44c13fb..16ac662 100644
--- a/README.mdown
+++ b/README.mdown
@@ -37,6 +37,10 @@
$ wget --no-check-certificate -q -O - https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | sudo sh
### Windows
+
+For Windows users, [msysgit](http://code.google.com/p/msysgit/) is a good
+starting place for installing git.
+
#### Using Cygwin
For Windows users who wish to use the automated install, it is suggested that you install [Cygwin](http://www.cygwin.com/)
first to install tools like `git`, `util-linux` and `wget` (with those three being packages that can be selected
@@ -44,32 +48,19 @@
$ wget -q -O - https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | sh
-#### Using msysgit
-This is much like the manual installation below, but there are additional steps required to install some extra tools that
-are not distributed with [msysgit](http://code.google.com/p/msysgit/).
+#### 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).
-Clone the git-flow sources from Github:
+Clone the git-flow sources from GitHub:
$ git clone --recursive git://github.com/nvie/gitflow.git
+ $ cd gitflow
-Copy git-flow's relevant files to your msysgit installation directory:
+Run the `msysgit-install` script from a command-line prompt (you may have to
+run it with "Full Administrator" rights if you installed msysgit with its
+installer):
- $ mkdir /usr/local/bin
- $ cp git-flow* gitflow* /usr/local/bin/
- $ cp shFlags/src/shflags /usr/local/bin/gitflow-shFlags
-
-Next up we need to borrow a couple of binaries from [Cygwin](http://www.cygwin.com/). If you don't have Cygwin installed, please
-install it including the `util-linux` package. Apart from `util-linux`'s dependencies, no other packages are required. When you
-finished installation, copy the following files using msysgit's _Git Bash_. We assume the Cygwin's default installation path in C:\cygwin.
-
- $ cd /c/cygwin/
- $ cp bin/getopt.exe /usr/local/bin/
- $ cp bin/cyggcc_s-1.dll /usr/local/bin/
- $ cp bin/cygiconv-2.dll /usr/local/bin/
- $ cp bin/cygintl-8.dll /usr/local/bin/
- $ cp bin/cygwin1.dll /usr/local/bin/
-
-After copying the files above, you can safely uninstall your Cygwin installation by deleting the C:\cygwin directory.
+ C:\gitflow> contrib\msysgit-install.cmd
### Manual installation
If you prefer a manual installation, please use the following instructions:
@@ -104,9 +95,6 @@
by [bobthecow](http://github.com/bobthecow). It offers tab-completion for all
git-flow subcommands and branch names.
-For Windows users, [msysgit](http://code.google.com/p/msysgit/) is a good
-starting place for installing git.
-
FAQ
---