merging-rebase: allow 'branch' to be something else than 'devel'

I'd like to use Jenkins in the near future to perform rebasing merges
whenever Junio updates 'next'. In order to do that, I will need the
merging-rebase script to perform on another branch than 'devel'.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Installer: Detect TortoisePLink from TortoiseGit

As TortoiseGit also comes with the improved version of Plink, offer the user to use that version, too.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Installer: Hide Directory and Program Group pages on upgrade

The user normally do not want to change these settings, also this speeds up the upgrade process.

This does not break parallel installs since AppId isn't set and includes no version number (in this case AppId defaults to AppName). Parallel installs were not fully supported before this patch (uninstaller in the Windows control panel always only points to the latest installation, ...).

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge pull request #33 from csware/installer

Installer
WinGit: Use the new logo from git-scm.com

These logos are picked up by the installer. Delete the SVG of the old
logo, an EPS file of the new one can be downloaded from git-scm.com.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Update the release notes (preliminary)

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Mark scripts and binaries in /bin/ as executable

This helps Cygwin and reusing msysGit scripts on Linux.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Added a compiled wrapper to replace the git.cmd script.

This addresses github issue #36 which points out problems in handling
git commit notations of the form tag^{commit} and HEAD^. The windows
command shell uses caret as a quote both on the command line and in
batch scripts and this results in requiring double quoting. To be
able to handle both "tag^{commit}" and tag^^{commit} (either style
of command prompt quoting) the script needs replacing. This also makes
it simpler to call git from batch scripts as it will no longer need to be
prefixed with 'call'.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Updated git wrapper exe

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Ensure git-gui uses the same icon as all other Git programs.

Overwrite the stock git-gui icon file with our own resource to provide
some visual consistency in the shipped applications.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Update for Git v1.7.11.1 to resolve issues since the v1.7.11 release.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Fix starting git-gui through git-wrapper.

Starting git-gui from the command line would result in an error because the
internal script variable was not initialized.

Signed-off-by: Theo Niessink <niessink@martinic.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Updated git wrapper exe

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
git-wrapper: ensure the child process exit code is returned.

The new compiled git wrapper failed to propagate the error code from the
wrapped process which causes problems when scripting git commands.
Also print error messages if something fails when launching the target
process.

This resolves github issue #43.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Updated git wrapper exe

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
WinGit: Equalize the spelling of "Plink" in the release notes

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
WinGit: Be more precise about what changed regarding TortoisePlink detection

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Include the CAcert root certificates in our CA certificate bundle.

This allows us to accept CAcert issued certificates as valid for SSL
connections. CAcert is a chain-of-trust certificate authority using a
model like PGP for authenticating trust and is used by some open source
sites as the CA issues free certificates provided there is sufficient
confirmation of identity using the web of trust.

The CAcert license requires mentioning in the documentation and it is
polite to list other packages that Git for Windows depends upon.

This closes github issue #37.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Update release notes

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Merge tag 'tags/Git-1.7.11-preview20120710' into devel

Git for Windows 1.7.11-preview20120710