Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' | Junio C Hamano | 2017-11-27 |
|\ | |||
| * | apply: update line lengths for --inaccurate-eof | René Scharfe | 2017-11-17 |
* | | Merge branch 'pw/sequencer-recover-from-unlockable-index' | Junio C Hamano | 2017-11-27 |
|\ \ | |||
| * | | sequencer: reschedule pick if index can't be locked | Phillip Wood | 2017-11-16 |
* | | | Merge branch 'sd/branch-copy' | Junio C Hamano | 2017-11-27 |
|\ \ \ | |||
| * | | | config: avoid "write_in_full(fd, buf, len) != len" pattern | Phillip Wood | 2017-11-16 |
* | | | | Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ | |||
| * | | | | merge-recursive: handle addition of submodule on our side of history | Elijah Newren | 2017-11-15 |
| * | | | | t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure | Stefan Beller | 2017-11-12 |
* | | | | | Merge branch 'tz/notes-error-to-stderr' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ | |||
| * | | | | | notes: send "Automatic notes merge failed" messages to stderr | Todd Zullinger | 2017-11-15 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'tz/redirect-fix' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ | |||
| * | | | | | rebase: fix stderr redirect in apply_autostash() | Todd Zullinger | 2017-11-14 |
| * | | | | | t/lib-gpg: fix gpgconf stderr redirect to /dev/null | Todd Zullinger | 2017-11-14 |
* | | | | | | Merge branch 'rv/sendemail-tocmd-in-config-and-completion' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ | |||
| * | | | | | | completion: add git config sendemail.tocmd | Rasmus Villemoes | 2017-11-14 |
| * | | | | | | Documentation/config: add sendemail.tocmd to list preceding "See git-send-ema... | Rasmus Villemoes | 2017-11-14 |
* | | | | | | | Merge branch 'jc/merge-base-fork-point-doc' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | merge-base --fork-point doc: clarify the example and failure modes | Junio C Hamano | 2017-11-09 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jc/ignore-cr-at-eol' | Junio C Hamano | 2017-11-27 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | diff: --ignore-cr-at-eol | Junio C Hamano | 2017-11-08 |
| * | | | | | | | xdiff: reassign xpparm_t.flags bits | Junio C Hamano | 2017-10-27 |
* | | | | | | | | Sync with maint | Junio C Hamano | 2017-11-21 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Almost ready for 2.15.1 | Junio C Hamano | 2017-11-21 |
| * | | | | | | | | Merge branch 'rs/sequencer-rewrite-file-cleanup' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'cb/t4201-robustify' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'tz/fsf-address-update' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ad/rebase-i-serie-typofix' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/info-alternates-fix' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ab/pcre-v2' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sr/wrapper-quote-filenames' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint | Junio C Hamano | 2017-11-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | RelNotes: the fifth batch for 2.16 | Junio C Hamano | 2017-11-21 |
* | | | | | | | | | | | | | | | | Merge branch 'rs/apply-fuzzy-match-fix' | Junio C Hamano | 2017-11-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | apply: avoid out-of-bounds access in fuzzy_matchlines() | René Scharfe | 2017-11-12 |
* | | | | | | | | | | | | | | | | | Merge branch 'ad/submitting-patches-title-decoration' | Junio C Hamano | 2017-11-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | doc/SubmittingPatches: correct subject guidance | Adam Dinwoodie | 2017-11-11 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge branch 'av/fsmonitor' | Junio C Hamano | 2017-11-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | fsmonitor: simplify determining the git worktree under Windows | Ben Peart | 2017-11-13 |
| * | | | | | | | | | | | | | | | | | fsmonitor: store fsmonitor bitmap before splitting index | Alex Vandiver | 2017-11-10 |
| * | | | | | | | | | | | | | | | | | fsmonitor: read from getcwd(), not the PWD environment variable | Alex Vandiver | 2017-11-10 |
| * | | | | | | | | | | | | | | | | | fsmonitor: delay updating state until after split index is merged | Alex Vandiver | 2017-11-01 |
| * | | | | | | | | | | | | | | | | | fsmonitor: document GIT_TRACE_FSMONITOR | Alex Vandiver | 2017-10-30 |
| * | | | | | | | | | | | | | | | | | fsmonitor: don't bother pretty-printing JSON from watchman | Alex Vandiver | 2017-10-30 |
| * | | | | | | | | | | | | | | | | | fsmonitor: set the PWD to the top of the working tree | Alex Vandiver | 2017-10-30 |
* | | | | | | | | | | | | | | | | | | Merge branch 'bp/fsmonitor' | Junio C Hamano | 2017-11-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | | | | | fsmonitor: preserve utf8 filenames in fsmonitor-watchman log | Ben Peart | 2017-10-05 |
| * | | | | | | | | | | | | | | | | | fsmonitor: read entirety of watchman output | Alex Vandiver | 2017-10-04 |
| * | | | | | | | | | | | | | | | | | fsmonitor: MINGW support for watchman integration | Ben Peart | 2017-10-04 |
| * | | | | | | | | | | | | | | | | | fsmonitor: add a performance test | Ben Peart | 2017-10-01 |