Commits on May 12, 2012
  1. @dscho

    merging-rebase: fix a couple of obsolete comments

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed May 11, 2012
  2. @dscho

    Add a new script to perform a 'merging rebase'

    We introduced the concept of a 'rebasing merge' earlier, which simply
    meant that in addition to rebasing all of our commits on top of
    git.git's 'next' branch, we also performed a merge with the previous
    state of the current branch using the 'ours' strategy, so that things
    still would fast-forward.
    
    This approach has quite a few shortcomings, not the least of which are:
    it is hard to find the commits that need to be rebased (because of the
    merge, all previous versions of the commits are part of the history),
    and we could not take advantage of rebase's --autosquash option.
    
    Instead, let's perform the merge with the 'ours' strategy _before_
    applying all the patches.
    
    That way, the commits to be rebased in the future can be obtained using
    the commit range <merge>.. where <merge> is simply the most recent start
    of a merging rebase.
    
    Since the introduction of the 'exec' command (thanks Matthieu Moy), the
    implementation is very easy: we only have to inject two commands at the
    start of the edit script to initialize the merging rebase.
    
    There is a cunning hack in the script to make use of previous rebasing
    merges (as opposed to merging rebases): we now require a single commit
    as base for use by 'git rebase -i'. Since the rebasing merges only
    provide a pair of bases, not a single base, we make a throw-away merge
    commit combining those two bases into a single one.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed May 11, 2012
  3. @dscho

    run-tests: use /usr/git/ instead of /git/ to please t9700

    The test script t9700 uses Perl's own cwd() call which reports
    /usr/git/t/<...> even when bash would report /git/t/<...>. Go the easy
    route by forcing the bash to believe we're in /usr/git/t/<...> (which is
    correct, as /usr/ points to / due to an internal MSys mechanism).
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed May 11, 2012
Commits on May 10, 2012
  1. @orefalo @dscho

    Fix zlib 1.2.6 not available from serve anymore

    Only the current version, 1.2.7, is available,
    
    	curl http://zlib.net/zlib-1.2.6.tar.gz
    
    returns a 404 Not Found.
    
    [jes: clarified commit message, as pointed out by Sebastian Schuberth.]
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    orefalo committed with dscho May 10, 2012
Commits on May 4, 2012
  1. @dscho

    what-made-this-repo-so-large: hide stderr

    verify-pack outputs a message to stderr for every pack it handles...
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed May 4, 2012
Commits on May 3, 2012
  1. @dscho

    Mark show-github-usage as executable

    ... so this developer can call it on Unix conveniently, too.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed May 2, 2012
  2. @dscho

    Add a script to find out what is responsible for repo bloat

    When you have a repository that is very large in size, it might be that
    you added your wedding DVD .iso by mistake. This script helps you identify
    which object bloats the repository and in which commit it was added.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed May 2, 2012
Commits on May 2, 2012
  1. @dscho
  2. @aroben

    Make copy-files.sh fail if any copy step fails

    Things used to work this way back before
    baa9434, but a bad merge in that commit
    caused this behavior to be lost.
    aroben committed Apr 30, 2012
  3. @dscho

    upload-to-github: allow spaces in filenames

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed May 2, 2012
Commits on Apr 18, 2012
  1. @dscho

    Rename github-usage.sh

    As noticed by Pat Thoyts, the contract of our installer build is that all
    the files in /bin/ starting with the prefix 'git' belong into the
    installer.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 18, 2012
Commits on Apr 17, 2012
  1. @dscho

    upload-to-github: also guess user from ~/.netrc

    ... unless it is specified explicitly, of course...
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 17, 2012
  2. @dscho

    upload-to-github: default to the msysgit/git repository

    ... for our downloads only, of course...
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 17, 2012
  3. @dscho

    Add a script to enquire about our disk usage on GitHub

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 17, 2012
  4. @dscho

    Add a script to upload stuff to GitHub

    With-great-help-from: Scott Chacon <schacon@gmail.com>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 17, 2012
Commits on Apr 16, 2012
  1. @patthoyts

    Fix inputrc for rxvt usage.

    When using rxvt the backspace key deletes the whole line because for
    rxvt and the bash prompt the backspace key produces different input.
    This patch ammends the handling of backspace/control-backspace for rxvt
    so that it only deletes one char at a time. Normal bash prompt input
    is left as before.
    
    Reported-by: Jon Seymour <jon.seymour@gmail.com>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    patthoyts committed Apr 16, 2012
Commits on Apr 13, 2012
  1. @dscho

    Spelling correction.

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Alex Ford committed with dscho Apr 13, 2012
Commits on Apr 11, 2012
  1. @patthoyts

    Default the TERM environment variable suitable for use with less.

    By default on windows the TERM environment variable is configured as
    'winansi' in git unless previously set. This is not accepted by the default
    pager (less) which produces an error message:
     "WARNING: terminal is not fully functional"
    Under git-bash TERM is configured by the shell as cygwin which less accepts
    and here we configure it as "msys" which also is acceptable to less.
    
    Signed-off-by: Theo Niessink <niessink@martinic.com>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
    Theo Niessink committed with patthoyts Apr 11, 2012
  2. @sschuberth

    Installer: Increase the text label width on the core.autocrlf options…

    … page
    
    The word "projects" in the second choice is cropped otherwise.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    sschuberth committed Apr 11, 2012
Commits on Apr 10, 2012
  1. @dscho

    apply-from-gmane: grok mid.gmane.org URLs and strip newlines from URLs

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 10, 2012
  2. @sschuberth @dscho

    WinGit: Do not create a release tag if it already exists

    Also, if a tag is reused or created, show its name.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    sschuberth committed with dscho Apr 10, 2012
  3. @dscho

    Merge pull request #5 from ciaranj/UpdateReleaseNotesForUnicode

    Remove a 'known issue' that is no longer an issue.
    dscho committed Apr 10, 2012
  4. @ciaranj

    Remove a 'known issue' that is no longer an issue.

    As the provided builds now contain the unicode patches, unicode
    support for filenames work.  This removes the need to document
    the historical character encoding issues that were a problem
    for msysgit.
    ciaranj committed Apr 10, 2012
  5. @dscho

    msvc-build: make sure transient files are git-ignored

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 9, 2012
  6. @dscho
  7. @dscho

    Commit the git-cheetah submodule in preparation for 1.7.10

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 9, 2012
  8. @dscho
  9. @dscho

    Update the submodules in preparation for 1.7.10

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 9, 2012
  10. @dscho

    run-tests: run more tests in parallel

    This forces us to save on screen estate...
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Apr 9, 2012
Commits on Mar 17, 2012
  1. @dscho

    Fix net installer's profile.d copying

    It helps to look in the right place.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 17, 2012
Commits on Mar 16, 2012
  1. @dscho

    Let the net installer optionally bundle profile.d/*.sh files

    This makes it convenient to come up with custom installers for development
    environments requiring more than just msysGit.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 16, 2012
  2. @dscho

    Fix path to file(1)'s magic file

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 16, 2012
Commits on Feb 23, 2012
  1. clarify context menu entry choice between cheetah and registry

    Many users seem to get confused when asked to decide between
    "Context menu entries" and "git-cheetah shell extension".
    
    Since they want the context menu entries many will choose the registry
    based ones since it explicitely talks about the context menu.
    
    Lets talk about the same thing "context menu" and distinguish them by
    calling them advanced and simple. To help existing users to recognize
    these option from the previous installers mention the methods
    (cheetah/registry) in brackets.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Heiko Voigt committed Feb 6, 2012
  2. @dscho

    Add a README.md file (so that our GitHub repository has something to …

    …show)
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Feb 23, 2012
  3. @dscho