summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/mingw-full-version-in-resources' into maintJunio C Hamano2017-11-152-3/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dk/libsecret-unlock-to-load-fix' into maintJunio C Hamano2017-11-151-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/early-config' into maintJunio C Hamano2017-11-151-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ad/5580-unc-tests-on-cygwin' into maintJunio C Hamano2017-11-151-4/+10
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix' into maintJunio C Hamano2017-11-151-8/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/blame-config-doc' into maintJunio C Hamano2017-11-151-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/complete-checkout' into maintJunio C Hamano2017-11-152-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/check-ref-format-oor' into maintJunio C Hamano2017-11-154-4/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/t5601-copy-workaround' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-exec-gitdir-fix' into maintJunio C Hamano2017-11-152-1/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/grep-recurse-submodules' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/submodule-in-excluded' into maintJunio C Hamano2017-11-152-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ao/check-resolve-ref-unsafe-result' into maintJunio C Hamano2017-11-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/misc-resolve-ref-unsafe-fixes' into maintJunio C Hamano2017-11-154-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/diff-color-moved-use-xdl-recmatch' into maintJunio C Hamano2017-11-153-78/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-color-moved-fix' into maintJunio C Hamano2017-11-152-42/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kd/auto-col-with-pager-fix' into maintJunio C Hamano2017-11-152-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/travis-fixes' into maintJunio C Hamano2017-11-153-7/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | RelNotes: the fourth batch for 2.16Junio C Hamano2017-11-151-24/+69
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bp/read-index-from-skip-verification'Junio C Hamano2017-11-153-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | read_index_from(): speed index loading by skipping verification of the entry ...bp/read-index-from-skip-verificationBen Peart2017-11-083-0/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/submitting-patches-in-asciidoc'Junio C Hamano2017-11-153-161/+192
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: convert SubmittingPatches to AsciiDocbrian m. carlson2017-11-133-161/+191
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: enable compat-mode for Asciidoctorbrian m. carlson2017-10-301-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/bisect-run-empty'Junio C Hamano2017-11-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status