Permalink
Switch branches/tags
Commits on Mar 31, 2011
  1. textconv: Pass through non-MS-Word *.doc files

    Some poeple may actually use the *.doc file extension for plain text files
    under Windows. In case antiword does not detect an MS-Word file, simply dump
    its contents unmodified.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    sschuberth committed Mar 31, 2011
Commits on Mar 29, 2011
  1. Include rebase.exe in the releases

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 29, 2011
Commits on Mar 22, 2011
  1. rebasing-merge: look harder for previous rebasing merge

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 22, 2011
  2. Turn on rebase's autosquash option by default

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 22, 2011
  3. Fix zlib compilation for 64-bit

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 22, 2011
Commits on Mar 18, 2011
  1. Update w64 fetch script to current mingw-w64

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 18, 2011
Commits on Mar 13, 2011
  1. textconv: stub driver for rtf

    At least it won't crash diff, untill we integrate unrtf (or something
    similar) into msysgit distribution.
    
    Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Kirill Smelkov committed with dscho Mar 13, 2011
  2. [PATCH] Git/WinGit: Add default textconv for .dot

    As suggested by Consul on the list:
    
        Is it possible to make the antiword handling Word templates (*.dot)
        as well as documents (*.doc) by default?
    
        It works fine, if I add
    
        [diff "antiword"]
                textconv = antiword -f
    
        into the config file and
    
        *.dot diff=antiword
    
        into the attributes file, but this is repository specific.
        Can we make this behavior default?
    
    Suggested-by: Alex Ivanov <void@aleksoft.net>
    Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
    Acked-by Alex Ivanov <void@aleksoft.net>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Kirill Smelkov committed with dscho Mar 13, 2011
  3. Handle .rtf files using the astextplain diff driver

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Kirill Smelkov committed with dscho Mar 13, 2011
Commits on Feb 18, 2011
  1. issue #535: support UNC paths for the "Git Bash Here" explorer menu i…

    …tem.
    
    As pointed out in issue #535 the explorer integration menu item does not
    open UNC paths. This patch creates a temporary shortcut item with the
    target path set before it executes the bash program and solves this issue.
    
    Suggested-by: Alex Ivanov <alexsi@aleksoft.net>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Feb 18, 2011
Commits on Feb 16, 2011
  1. Associate .sh files to be run with bash in the installer

    This adds a checkbox to the installer to associate *.sh files with
    /bin/sh.exe.
    
    Having bash scripts automatically run by git bash is helpful because you
    can directly bash scripts from cmd.exe, via doubleclick in the explorer
    or use them directly in IDEs.
    
    We add a DropHandler for the COM object of shell32.dll which will
    dispatch the dropped files as arguments to the registered open command
    of .sh files. Thus you can drop files on sh scripts the same ways as on
    batch scripts.
    
    The registered icon is the default icon for batch scripts to give some
    visual indication that .sh files are something similar and can be
    executed directly.
    
    Signed-off-by: Heiko Voigt <heiko.voigt@mahr.de>
    Cleaned up and
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Heiko Voigt committed Feb 12, 2011
Commits on Feb 10, 2011
  1. Installer: Update Inno Setup to version 5.4.1 (Unicode)

    For the revision history, see:
    http://www.jrsoftware.org/files/is5-whatsnew.htm
    
    Previously, the required preprocessor (ISPP) was only shipped with the
    QuickStart Pack. As it now also comes with regular Inno Setup, this commit
    takes its files from the directory of a regular Inno Setup installation.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    sschuberth committed Feb 10, 2011
Commits on Feb 7, 2011
Commits on Feb 4, 2011
  1. Updated to Git v1.7.4

    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Feb 4, 2011
Commits on Jan 19, 2011
  1. wine-start: optionally rebase the msys-1.0.dll first

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Jan 19, 2011
Commits on Jan 17, 2011
  1. Add a super-simple pseudo 'ldd'

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Jan 9, 2011
  2. Add a convenience script to start msysGit in WINE

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Jan 8, 2011
  3. Add the rebase.exe tool to be able to fix msys-1.0.dll

    Depending on your setup, the base address of msys-1.0.dll might clash
    with other .dll files' addresses. The symptom looks like this:
    
    assertion "!inheap (s)" failed: file "../../../../src/winsup/cygwin/cygheap.cc", line 309
    
    This was the case with 32-bit Ubuntu and WINE for this here developer,
    for example.
    
    In such a case, simply fire up cmd.exe, change the working directory to
    $MSYSGIT_ROOT/bin and execute something like
    
    	..\mingw\bin\rebase -b 0x67000000 msys-1.0.dll
    
    The rebase.exe tool was cherry-picked from the 'full' branch, where it
    was built from /src/rebase/.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Jan 8, 2011
  4. Add /src/rebase

    The tool 'rebase' is needed to avoid memory region clashes between .dll
    files.  This commit adds the infrastructure to recompile 'rebase.exe'.
    
    Just call /src/rebase/release.sh and you're fixed.
    
    [This commit was cherry-picked from the 'full' branch.]
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Feb 21, 2008
Commits on Dec 25, 2010
  1. /etc/profile: strip out cygwin paths from PATH

    This is useful for users on both msys/mingw and cygwin, as it prevents
    cygwin executables/libraries from "contaminating" operations on
    msys/mingw, like compilation and execution.
    
    [Sebastian Schuberth suggested a much shorter invocation as per
    http://stackoverflow.com/questions/370047/ (we added proper handling of
    the trailing separator), and to avoid unnecessary spawning, the call is
    wrapped in a case...esac construct]
    
    Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    rctay committed with dscho Dec 25, 2010
Commits on Dec 22, 2010
  1. Wine: do not use intelligent Git prompt

    Kirill said it's too slow with Wine, and I agree.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Dec 22, 2010
  2. Wine: avoid problems with inherited LS_COLORS

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Dec 22, 2010
  3. MinGWify 'depends'

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Feb 18, 2009
  4. Add initial 'depends' sources from w00depends

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Feb 18, 2009
Commits on Dec 20, 2010
  1. gitconfig: Turn on colors for status, branch and interactive (add -p)

    We already do coloring for diff, but not for other commands. In my view,
    status, branch and interactive are too used often, so it would be
    logical to turn colors either on or off for the whole bundle. I vote for
    on.
    
    Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
    Kirill Smelkov committed Dec 20, 2010
  2. wordpad: Silence unimportant internal ls errors

    So that e.g. `wordpad something.rtf` terminal output is not noised with
    messages about some paths not being there:
    
        $ wordpad share/WinGit/ReleaseNotes.rtf
        ls: C:\Program Files/Windows NT/*/wordpad.exe: No such file or directory
        # working wordpad starts here
    
    Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
    Kirill Smelkov committed Dec 20, 2010
  3. wordpad: On Wine, wordpad.exe is in C;\Windows\System32\

    Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
    Kirill Smelkov committed Dec 20, 2010
  4. Install antiword (Git 0680e7ee62e430e0905085e5b4cfb01d31db5936)

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Dec 20, 2010
  5. Install poppler-0.14.5.tar.gz

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Dec 20, 2010
  6. Git/WinGit: Add default textconv for .doc & .pdf

    XXX at present bin/astextplain output encoding is hardcoded to UTF-8.
    Even in such a state the service provided is more than useful, so let's
    please merge the patch.
    
    Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
    Kirill Smelkov committed with Kirill Smelkov Nov 12, 2010
  7. WinGit: distribute pdftotext + friends

    Just like with antiword. pdfinfo is included too because it's a very small and
    usuful utility.
    
    Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
    Kirill Smelkov committed with Kirill Smelkov Nov 22, 2010
  8. Add script to compile/install poppler (for pdftotext)

    Like with *.doc, *.pdf is a widely used format, so it would be a good
    idea to ship default textconv driver for pdf. For this we'll use
    pdftotext which is part of poppler. pdfinfo is also sometimes useful, so
    let's ship it too.
    
    NOTE: libpoppler-7.dll is 4.7M unstripped and 1.6M stripped. So far
    I've not stripped it, becase right now we don't strip other
    libraries and programs which we build ourselves from src/ (e.g.
    libcurl-4.dll is 403K as shipped and 297K if stripped). But maybe it
    would be a good idea to strip everything we build...
    
    NOTE2: I've had to workaround one bug in TDM GCC that we ship...
    
    Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
    Kirill Smelkov committed with Kirill Smelkov Nov 22, 2010
  9. WinGit: distribute antiword

    Let's ship antiword together with installed WinGit, and let's
    configure Git (see neighbor patch) to use it as default textconv for *.doc.
    
    Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
    Kirill Smelkov committed with Kirill Smelkov Nov 12, 2010
  10. Add script to compile/install/distribute antiword

    This days Git on Windows is used not only for code, but more and more
    for managing documentation workflow. And on Windows a lot of people use
    *.doc as document format.
    
    So the idea is to provide textconv diff & blame support for *.doc out of
    the box, for which we'll need default textconv driver.
    
    Personally I've been using antiword on Linux for such porpose for quite
    some time already, and while not perfect, antiword works ok -- I can see
    what's changed in git, and `git gui blame` docs, which is great to me.
    
    NOTE: antiword needs to access files with encoding mapping tables, and since we
    are going to add antiword to distribution (next patch) for this I had to patch
    it to determine installation prefix at runtime, just like git does.
    
    Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
    Kirill Smelkov committed with Kirill Smelkov Nov 12, 2010
Commits on Nov 11, 2010
  1. Installer: Add a note about HKLM vs. HKCU Registry values

    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    sschuberth committed Nov 11, 2010