Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure | Stefan Beller | 2017-11-12 | 1 | -0/+36 | |
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'tz/notes-error-to-stderr' | Junio C Hamano | 2017-11-27 | 3 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | notes: send "Automatic notes merge failed" messages to stderrtz/notes-error-to-stderr | Todd Zullinger | 2017-11-15 | 3 | -9/+9 | |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'tz/redirect-fix' | Junio C Hamano | 2017-11-27 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | rebase: fix stderr redirect in apply_autostash()tz/redirect-fix | Todd Zullinger | 2017-11-14 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | t/lib-gpg: fix gpgconf stderr redirect to /dev/null | Todd Zullinger | 2017-11-14 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rv/sendemail-tocmd-in-config-and-completion' | Junio C Hamano | 2017-11-27 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | completion: add git config sendemail.tocmdrv/sendemail-tocmd-in-config-and-completion | Rasmus Villemoes | 2017-11-14 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema... | Rasmus Villemoes | 2017-11-14 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/merge-base-fork-point-doc' | Junio C Hamano | 2017-11-27 | 1 | -8/+56 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | merge-base --fork-point doc: clarify the example and failure modesjc/merge-base-fork-point-doc | Junio C Hamano | 2017-11-09 | 1 | -8/+56 | |
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 | 8 | -18/+92 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | diff: --ignore-cr-at-eoljc/ignore-cr-at-eol | Junio C Hamano | 2017-11-08 | 8 | -6/+78 | |
| * | | | | | | | | | | | | | | | | | | | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 2017-10-27 | 2 | -13/+15 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | 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 |