net-installer: update for the new curl dll.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Installer: Minor improvements to selecting a Plink executable

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
iconv: remove redundant file - we now use libiconv-2.dll

No file in mingw/bin is linked to libiconv2.dll any more.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
iconv: include iconv.exe in the Git for Windows release.

As discussed in issue #113 it is useful to have a method for converting
between unicode and utf-8 for writing smudge/clean filters. To assist in
this we shall include a functional iconv.exe in the release.
A side effect is we now also ship libintl-8.dll.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
msysgit: include old libiconv2 for use by dd.exe and stat.exe.

These two files have been pulled in from CoreUtils and were built against
an old set of libraries. We do not ship these binaries so we can avoid
rebuilding against the current libintl-8 library although this should
be done sometime. Used when running the test suite.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Updated msys-1.0.dll to MSYS-gd046b81

Signed-off-by: Karsten Blees <blees@dcon.de>
Updated bash.exe to MSYS-gd046b81

Signed-off-by: Karsten Blees <blees@dcon.de>
Update bash/readline settings for Unicode line editing

Enable multibyte character on input and output and disable ASCII conversion
in etc/inputrc.

Signed-off-by: Karsten Blees <blees@dcon.de>
Bu-bye, rebasing-merge.sh

It was discussed recently that it is rather confusing to keep that
script when we retired it in favor of merging-rebase.sh...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
apply-from-gmane: accept permalinks, too

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
apply-from-gmane: fall back to three-way merges

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
merging-rebase: be more suspicious about merging-rebase candidates

Sometimes people commit all kinds of stuff before performing a merging
rebase, and that unfortunately also entails merges that look like '-s
ours' type merges. Therefore, it is not good enough to look whether
the merge looks like that, but we also have to ask the user if that's
the start of the latest merging rebase.

Only when we find that the commit subject contains 'merging-rebase',
we trust that we have found the correct merge.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
openssl: update release script to use version 0.9.8y

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Install OpenSSL 0.9.8y

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Install OpenSSL 0.9.8y import libs

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Install OpenSSL 0.9.8y header files

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
merging-rebase: set both GIT_SEQUENCE_EDITOR and GIT_EDITOR to modify the insn-cheet

Somehow git rebase -i seems to ignore GIT_EDITOR and only uses
GIT_SEQUENCE_EDITOR. Set both variables to not introduce a regression.

Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com>
Merge pull request #129 from snaewe/fix-merging-rebase

merging-rebase: set both GIT_SEQUENCE_EDITOR and GIT_EDITOR to modify the insn-cheet
msys: added setlocal to keep variables in subshell

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
ReleaseNotes: mention the problem with -L/regex/ being misinterpreted

Suggested by Pat Thoyts.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>