Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | log: add option to choose which refs to decoratera/decorate-limit-refs | Rafael Ascensão | 2017-11-22 | 9 | -11/+232 |
* | Sync with maint | Junio C Hamano | 2017-11-21 | 1 | -0/+12 |
|\ | |||||
| * | Almost ready for 2.15.1 | Junio C Hamano | 2017-11-21 | 1 | -0/+12 |
| * | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint | Junio C Hamano | 2017-11-21 | 1 | -29/+16 |
| |\ | |||||
| * \ | Merge branch 'cb/t4201-robustify' into maint | Junio C Hamano | 2017-11-21 | 2 | -5/+7 |
| |\ \ | |||||
| * \ \ | Merge branch 'tz/fsf-address-update' into maint | Junio C Hamano | 2017-11-21 | 44 | -103/+69 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ad/rebase-i-serie-typofix' into maint | Junio C Hamano | 2017-11-21 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/info-alternates-fix' into maint | Junio C Hamano | 2017-11-21 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ab/pcre-v2' into maint | Junio C Hamano | 2017-11-21 | 2 | -3/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'sr/wrapper-quote-filenames' into maint | Junio C Hamano | 2017-11-21 | 3 | -6/+6 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint | Junio C Hamano | 2017-11-21 | 2 | -1/+20 |
| |\ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | RelNotes: the fifth batch for 2.16 | Junio C Hamano | 2017-11-21 | 1 | -12/+9 |
* | | | | | | | | | | Merge branch 'rs/apply-fuzzy-match-fix' | Junio C Hamano | 2017-11-21 | 1 | -39/+20 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | apply: avoid out-of-bounds access in fuzzy_matchlines()rs/apply-fuzzy-match-fix | René Scharfe | 2017-11-12 | 1 | -39/+20 |
* | | | | | | | | | | | Merge branch 'ad/submitting-patches-title-decoration' | Junio C Hamano | 2017-11-21 | 1 | -8/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | doc/SubmittingPatches: correct subject guidancead/submitting-patches-title-decoration | Adam Dinwoodie | 2017-11-11 | 1 | -8/+13 |
* | | | | | | | | | | | | Merge branch 'av/fsmonitor' | Junio C Hamano | 2017-11-21 | 8 | -48/+77 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | fsmonitor: simplify determining the git worktree under Windowsav/fsmonitor | Ben Peart | 2017-11-13 | 2 | -20/+6 |
| * | | | | | | | | | | | | fsmonitor: store fsmonitor bitmap before splitting index | Alex Vandiver | 2017-11-10 | 4 | -9/+36 |
| * | | | | | | | | | | | | fsmonitor: read from getcwd(), not the PWD environment variable | Alex Vandiver | 2017-11-10 | 2 | -2/+4 |
| * | | | | | | | | | | | | fsmonitor: delay updating state until after split index is merged | Alex Vandiver | 2017-11-01 | 2 | -16/+25 |
| * | | | | | | | | | | | | fsmonitor: document GIT_TRACE_FSMONITOR | Alex Vandiver | 2017-10-30 | 1 | -0/+4 |
| * | | | | | | | | | | | | fsmonitor: don't bother pretty-printing JSON from watchman | Alex Vandiver | 2017-10-30 | 1 | -1/+1 |
| * | | | | | | | | | | | | fsmonitor: set the PWD to the top of the working tree | Alex Vandiver | 2017-10-30 | 1 | -0/+1 |
* | | | | | | | | | | | | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2017-11-21 | 33 | -23/+1570 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | fsmonitor: preserve utf8 filenames in fsmonitor-watchman log | Ben Peart | 2017-10-05 | 1 | -0/+1 |
| * | | | | | | | | | | | | fsmonitor: read entirety of watchman output | Alex Vandiver | 2017-10-04 | 2 | -8/+4 |
| * | | | | | | | | | | | | fsmonitor: MINGW support for watchman integration | Ben Peart | 2017-10-04 | 2 | -2/+2 |
| * | | | | | | | | | | | | fsmonitor: add a performance test | Ben Peart | 2017-10-01 | 4 | -0/+350 |
| * | | | | | | | | | | | | fsmonitor: add a sample integration script for Watchman | Ben Peart | 2017-10-01 | 1 | -0/+122 |
| * | | | | | | | | | | | | fsmonitor: add test cases for fsmonitor extension | Ben Peart | 2017-10-01 | 4 | -0/+490 |
| * | | | | | | | | | | | | split-index: disable the fsmonitor extension when running the split index test | Ben Peart | 2017-10-01 | 1 | -0/+1 |
| * | | | | | | | | | | | | fsmonitor: add a test tool to dump the index extension | Ben Peart | 2017-10-01 | 3 | -0/+23 |
| * | | | | | | | | | | | | update-index: add fsmonitor support to update-index | Ben Peart | 2017-10-01 | 1 | -1/+32 |
| * | | | | | | | | | | | | ls-files: Add support in ls-files to display the fsmonitor valid bit | Ben Peart | 2017-10-01 | 1 | -2/+6 |
| * | | | | | | | | | | | | fsmonitor: add documentation for the fsmonitor extension. | Ben Peart | 2017-10-01 | 5 | -1/+105 |
| * | | | | | | | | | | | | fsmonitor: teach git to optionally utilize a file system monitor to speed up ... | Ben Peart | 2017-10-01 | 16 | -19/+417 |
| * | | | | | | | | | | | | update-index: add a new --force-write-index option | Ben Peart | 2017-09-24 | 1 | -1/+4 |
| * | | | | | | | | | | | | preload-index: add override to enable testing preload-index | Ben Peart | 2017-09-24 | 1 | -0/+2 |
| * | | | | | | | | | | | | bswap: add 64 bit endianness helper get_be64 | Ben Peart | 2017-09-24 | 1 | -0/+22 |
* | | | | | | | | | | | | | git-jump: give contact instructions in the README | Jeff King | 2017-11-21 | 1 | -0/+7 |
* | | | | | | | | | | | | | contrib/git-jump: allow to configure the grep command | Beat Bolli | 2017-11-21 | 2 | -2/+8 |
* | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2017-11-15 | 1 | -0/+68 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Start preparation for 2.15.1 | Junio C Hamano | 2017-11-15 | 3 | -2/+70 |
| * | | | | | | | | | | | | Merge branch 'ks/mailmap' into maint | Junio C Hamano | 2017-11-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jm/relnotes-2.15-typofix' into maint | Junio C Hamano | 2017-11-15 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint | Junio C Hamano | 2017-11-15 | 4 | -9/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/mingw-redirect-std-handles' into maint | Junio C Hamano | 2017-11-15 | 3 | -0/+88 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/wincred-empty-cred' into maint | Junio C Hamano | 2017-11-15 | 2 | -2/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/mingw-full-version-in-resources' into maint | Junio C Hamano | 2017-11-15 | 2 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |