Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: chinagps/git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: msysgit/git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 5 files changed
  • 4 contributors

Commits on Aug 29, 2014

  1. git-gui/gitk: Do not use a Cygwin-specific kill flag on Windows

    Windows does not necessarily mean Cygwin, it could also be MSYS. The
    latter ships with a version of "kill" that does not understand "-f". In
    msysgit this was addressed shipping Cygwin's version of kill.
    
    Properly fix this by using the stock Windows "taskkill" command instead,
    which is available since Windows XP Professional.
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    sschuberth committed Aug 29, 2014
    Configuration menu
    Copy the full SHA
    23b4c7e View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2014

  1. Merge pull request msysgit#239 from sschuberth/taskkill

    git-gui/gitk: Do not use a Cygwin-specific kill flag on Windows
    dscho committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    8768113 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2014

  1. README: Git for Windows is currently switching to the Git for Windows…

    … SDK
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    d85c794 View commit details
    Browse the repository at this point in the history
  2. Remove the dysfunctional link to tip4commit

    Due to the lack of donations, tip4commit removed us from their list.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    b6e1e35 View commit details
    Browse the repository at this point in the history
  3. Merge pull request msysgit#285 from dscho/readme

    Update README.md
    dscho committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    c47d6ec View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2015

  1. git-gui:handle the encoding of Git's output correctly

    if we use 'eval exec $opt $cmdp $args' to execute git command,
    tcl engine will convert the output of the git comand with the rule
    system default code page to unicode.
    But cp936 -> unicode conversion implicitly done by exec is not reversible.
    So we have to use git_read instead.
    
    Bug report and an original reproducer by Cloud Chou:
    msysgit#302
    
    Karsten Blees writes this code patch.
    Cloud Chou find the reason of the bug.
    
    Thanks-to: dscho
    Thanks-to: patthoyts
    Signed-off-by: Karsten Blees <blees@dcon.de>
    Original-test-by: Cloud Chou <515312382@qq.com>
    Signed-off-by: Cloud Chou <515312382@qq.com>
    kblees authored and cloudchou committed Mar 7, 2015
    Configuration menu
    Copy the full SHA
    7020038 View commit details
    Browse the repository at this point in the history
  2. Merge pull request msysgit#323 from cloudchou/master

    git gui: handle Git's output encoding correctly
    dscho committed Mar 7, 2015
    Configuration menu
    Copy the full SHA
    b21930f View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2015

  1. poll: honor the timeout on Win32

    Ensure that when passing a pipe, the gnulib poll replacement will not
    return 0 before the timeout has passed.
    
    Not obeying the timeout (and merely returning 0) causes pathological
    behavior when preparing a packfile for a repository and taking a
    long time to do so.  If poll were to return 0 immediately, this would
    cause keep-alives to get sent as quickly as possible until the packfile
    was created.  Such deviance from the standard would cause megabytes (or
    more) of keep-alive packets to be sent.
    
    GetTickCount is used as it is efficient, stable and monotonically
    increasing.  (Neither GetSystemTime nor QueryPerformanceCounter have
    all three of these properties.)
    Edward Thomson committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    fb6aa9a View commit details
    Browse the repository at this point in the history
  2. Merge pull request msysgit#330 from ethomson/poll_inftim

    poll: honor the timeout on Win32
    dscho committed Mar 18, 2015
    Configuration menu
    Copy the full SHA
    dd8b3ba View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2015

  1. msysGit-based Git for Windows 1.x was superseded by Git for Windows 2.x

    Please find the home of Git for Windows 2.x here:
    
    	https://git-for-windows.github.io/
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    3259ef9 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2016

  1. Configuration menu
    Copy the full SHA
    8433814 View commit details
    Browse the repository at this point in the history
Loading