summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)ab/pcre2-grepÆvar Arnfjörð Bjarmason2017-11-242-0/+32
* test-lib: add LIBPCRE1 & LIBPCRE2 prerequisitesÆvar Arnfjörð Bjarmason2017-11-242-0/+14
* Sync with maintJunio C Hamano2017-11-211-0/+12
|\
| * Almost ready for 2.15.1Junio C Hamano2017-11-211-0/+12
| * Merge branch 'rs/sequencer-rewrite-file-cleanup' into maintJunio C Hamano2017-11-211-29/+16
| |\
| * \ Merge branch 'cb/t4201-robustify' into maintJunio C Hamano2017-11-212-5/+7
| |\ \
| * \ \ Merge branch 'tz/fsf-address-update' into maintJunio C Hamano2017-11-2144-103/+69
| |\ \ \
| * \ \ \ Merge branch 'ad/rebase-i-serie-typofix' into maintJunio C Hamano2017-11-211-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano2017-11-211-1/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ab/pcre-v2' into maintJunio C Hamano2017-11-212-3/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sr/wrapper-quote-filenames' into maintJunio C Hamano2017-11-213-6/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bw/rebase-i-ignored-submodule-fix' into maintJunio C Hamano2017-11-212-1/+20
| |\ \ \ \ \ \ \ \
* | | | | | | | | | RelNotes: the fifth batch for 2.16Junio C Hamano2017-11-211-12/+9
* | | | | | | | | | Merge branch 'rs/apply-fuzzy-match-fix'Junio C Hamano2017-11-211-39/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: avoid out-of-bounds access in fuzzy_matchlines()rs/apply-fuzzy-match-fixRené Scharfe2017-11-121-39/+20
* | | | | | | | | | | Merge branch 'ad/submitting-patches-title-decoration'Junio C Hamano2017-11-211-8/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc/SubmittingPatches: correct subject guidancead/submitting-patches-title-decorationAdam Dinwoodie2017-11-111-8/+13
* | | | | | | | | | | | Merge branch 'av/fsmonitor'Junio C Hamano2017-11-218-48/+77
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fsmonitor: simplify determining the git worktree under Windowsav/fsmonitorBen Peart2017-11-132-20/+6
| * | | | | | | | | | | | fsmonitor: store fsmonitor bitmap before splitting indexAlex Vandiver2017-11-104-9/+36
| * | | | | | | | | | | | fsmonitor: read from getcwd(), not the PWD environment variableAlex Vandiver2017-11-102-2/+4
| * | | | | | | | | | | | fsmonitor: delay updating state until after split index is mergedAlex Vandiver2017-11-012-16/+25
| * | | | | | | | | | | | fsmonitor: document GIT_TRACE_FSMONITORAlex Vandiver2017-10-301-0/+4
| * | | | | | | | | | | | fsmonitor: don't bother pretty-printing JSON from watchmanAlex Vandiver2017-10-301-1/+1
| * | | | | | | | | | | | fsmonitor: set the PWD to the top of the working treeAlex Vandiver2017-10-301-0/+1
* | | | | | | | | | | | | Merge branch 'bp/fsmonitor'Junio C Hamano2017-11-2133-23/+1570
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | fsmonitor: preserve utf8 filenames in fsmonitor-watchman logBen Peart2017-10-051-0/+1
| * | | | | | | | | | | | fsmonitor: read entirety of watchman outputAlex Vandiver2017-10-042-8/+4
| * | | | | | | | | | | | fsmonitor: MINGW support for watchman integrationBen Peart2017-10-042-2/+2
| * | | | | | | | | | | | fsmonitor: add a performance testBen Peart2017-10-014-0/+350
| * | | | | | | | | | | | fsmonitor: add a sample integration script for WatchmanBen Peart2017-10-011-0/+122
| * | | | | | | | | | | | fsmonitor: add test cases for fsmonitor extensionBen Peart2017-10-014-0/+490
| * | | | | | | | | | | | split-index: disable the fsmonitor extension when running the split index testBen Peart2017-10-011-0/+1
| * | | | | | | | | | | | fsmonitor: add a test tool to dump the index extensionBen Peart2017-10-013-0/+23
| * | | | | | | | | | | | update-index: add fsmonitor support to update-indexBen Peart2017-10-011-1/+32
| * | | | | | | | | | | | ls-files: Add support in ls-files to display the fsmonitor valid bitBen Peart2017-10-011-2/+6
| * | | | | | | | | | | | fsmonitor: add documentation for the fsmonitor extension.Ben Peart2017-10-015-1/+105
| * | | | | | | | | | | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ...Ben Peart2017-10-0116-19/+417
| * | | | | | | | | | | | update-index: add a new --force-write-index optionBen Peart2017-09-241-1/+4
| * | | | | | | | | | | | preload-index: add override to enable testing preload-indexBen Peart2017-09-241-0/+2
| * | | | | | | | | | | | bswap: add 64 bit endianness helper get_be64Ben Peart2017-09-241-0/+22
* | | | | | | | | | | | | git-jump: give contact instructions in the READMEJeff King2017-11-211-0/+7
* | | | | | | | | | | | | contrib/git-jump: allow to configure the grep commandBeat Bolli2017-11-212-2/+8
* | | | | | | | | | | | | Sync with maintJunio C Hamano2017-11-151-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Start preparation for 2.15.1Junio C Hamano2017-11-153-2/+70
| * | | | | | | | | | | | Merge branch 'ks/mailmap' into maintJunio C Hamano2017-11-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/relnotes-2.15-typofix' into maintJunio C Hamano2017-11-151-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/diff-indent-no-longer-is-experimental' into maintJunio C Hamano2017-11-154-9/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/mingw-redirect-std-handles' into maintJunio C Hamano2017-11-153-0/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/wincred-empty-cred' into maintJunio C Hamano2017-11-152-2/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \