Skip to content
Permalink
Branch: master
Commits on Sep 2, 2019
  1. Merge pull request #2315 from ROGERSM94/fix-rebase

    dscho committed Sep 2, 2019
    rebase-merges: improve --rebase-merges label generation
  2. Merge pull request #2316 from carenas/win-pcre1-cleanup

    dscho committed Sep 2, 2019
    config.mak.uname: PCRE1 cleanup
Commits on Aug 23, 2019
  1. Merge pull request #2303 from git-for-windows/security.md

    dscho committed Aug 23, 2019
    SECURITY.md: document Git for Windows' policies
  2. SECURITY.md: document Git for Windows' policies

    dscho committed Aug 23, 2019
    This is the recommended way on GitHub to describe policies revolving around
    security issues and about supported versions.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Commits on Aug 16, 2019
  1. Merge 'readme' into HEAD

    dscho committed Jun 7, 2018
    Add a README.md for GitHub goodness.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  2. Merge pull request #1354 from dscho/phase-out-show-ignored-directory-…

    dscho committed Jun 8, 2018
    …gracefully
    
    Phase out `--show-ignored-directory` gracefully
  3. Merge branch 'status-no-lock-index'

    dscho committed Jun 8, 2018
    This branch allows third-party tools to call `git status
    --no-lock-index` to avoid lock contention with the interactive Git usage
    of the actual human user.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  4. Merge pull request #1170 from dscho/mingw-kill-process

    dscho committed Oct 11, 2018
    Handle Ctrl+C in Git Bash nicely
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  5. Merge branch 'busybox-w32'

    dscho committed Feb 7, 2019
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  6. Merge pull request #1897 from piscisaureus/symlink-attr

    dscho committed Oct 31, 2018
    Specify symlink type in .gitattributes
  7. Merge 'docker-volumes-are-no-symlinks'

    dscho committed Oct 12, 2018
    This was pull request #1645 from ZCube/master
    
    Support windows container.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  8. Merge branch 'msys2'

    dscho committed Nov 15, 2018
  9. Merge branch 'long-paths'

    dscho committed Nov 15, 2018
  10. Merge branch 'dont-clean-junctions-fscache'

    dscho committed Jul 23, 2019
    We already avoid traversing NTFS junction points in `git clean -dfx`.
    With this topic branch, we do that when the FSCache is enabled, too.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  11. Merge pull request #1937 from benpeart/fscache-NtQueryDirectoryFile-gfw

    dscho committed Nov 27, 2018
     fscache: teach fscache to use NtQueryDirectoryFile
  12. Merge pull request #1934 from benpeart/fscache-thread-safe-enable-gfw

    dscho committed Nov 26, 2018
    fscache: make fscache_enable() thread safe
  13. Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'

    dscho committed Nov 16, 2018
    This brings substantial wins in performance because the FSCache is now
    per-thread, being merged to the primary thread only at the end, so we do
    not have to lock (except while merging).
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  14. Merge pull request #1910 from benpeart/fscache_statistics-gfw

    dscho committed Nov 16, 2018
    fscache: add fscache hit statistics
  15. Merge pull request #1914 from benpeart/free-fscache-after-add-gfw

    dscho committed Nov 16, 2018
    At the end of the add command, disable and free the fscache
  16. Merge pull request #1911 from benpeart/git_test_fscache-gfw

    dscho committed Nov 5, 2018
    fscache: add GIT_TEST_FSCACHE support
  17. Merge pull request #1909 from benpeart/free-fscache-after-status-gfw

    dscho committed Nov 5, 2018
    status: disable and free fscache at the end of the status command
  18. Merge pull request #1908 from benpeart/FindFirstFileEx-gfw

    dscho committed Nov 5, 2018
    fscache: use FindFirstFileExW to avoid retrieving the short name
  19. Merge pull request #1827 from benpeart/fscache_refresh_index

    dscho committed Sep 27, 2018
    Enable the filesystem cache (fscache) in refresh_index().
  20. Merge pull request #1468 from atetubou/fscache_checkout_flush

    dscho committed Oct 12, 2018
    checkout.c: enable fscache for checkout again
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  21. Merge pull request #1426 from atetubou/fetch_pack

    dscho committed Jun 8, 2018
    fetch-pack.c: enable fscache for stats under .git/objects
  22. Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fs…

    dscho committed Jun 8, 2018
    …cache
    
    dir.c: make add_excludes aware of fscache during status
  23. Merge pull request #971 from jeffhostetler/jeffhostetler/add_preload_…

    dscho committed Jun 8, 2018
    …fscache
    
    add: use preload-index and fscache for performance
  24. Merge pull request #994 from jeffhostetler/jeffhostetler/fscache_nfd

    dscho committed Jun 8, 2018
    fscache: add not-found directory cache to fscache
  25. Merge branch 'fscache'

    dscho committed Nov 15, 2018
  26. Merge 'add-p-many-files'

    dscho committed Jun 8, 2018
    This topic branch allows `add -p` and `add -i` with a large number of
    files. It is kind of a hack that was never really meant to be
    upstreamed. Let's see if we can do better in the built-in `add -p`.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  27. Merge branch 'inherit-only-stdhandles'

    dscho committed Jan 31, 2018
    When spawning child processes, we do want them to inherit the standard
    handles so that we can talk to them. We do *not* want them to inherit
    any other handle, as that would hold a lock to the respective files
    (preventing them from being renamed, modified or deleted), and the child
    process would not know how to access that handle anyway.
    
    Happily, there is an API to make that happen. It is supported in Windows
    Vista and later, which is exactly what we promise to support in Git for
    Windows for the time being.
    
    This also means that we lift, at long last, the target Windows version
    from Windows XP to Windows Vista.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  28. Merge branch 'gitk-and-git-gui-patches'

    dscho committed Oct 11, 2018
    These are Git for Windows' Git GUI and gitk patches. We will have to
    decide at some point what to do about them, but that's a little lower
    priority (as Git GUI seems to be unmaintained for the time being, and
    the gitk maintainer keeps a very low profile on the Git mailing list,
    too).
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  29. Merge branch 'ready-for-upstream'

    dscho committed Oct 11, 2018
    This is the branch thicket of patches in Git for Windows that are
    considered ready for upstream. To keep them in a ready-to-submit shape,
    they are kept as close to the beginning of the branch thicket as
    possible.
  30. mingw: really handle SIGINT

    dscho committed Apr 22, 2018
    Previously, we did not install any handler for Ctrl+C, but now we really
    want to because the MSYS2 runtime learned the trick to call the
    ConsoleCtrlHandler when Ctrl+C was pressed.
    
    With this, hitting Ctrl+C while `git log` is running will only terminate
    the Git process, but not the pager. This finally matches the behavior on
    Linux and on macOS.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Older
You can’t perform that action at this time.