Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint | Junio C Hamano | 2017-10-18 |
|\ | |||
| * | subprocess: loudly die when subprocess asks for an unsupported capability | Junio C Hamano | 2017-09-11 |
* | | Merge branch 'jk/system-path-cleanup' into maint | Junio C Hamano | 2017-10-18 |
|\ \ | |||
| * | | git_extract_argv0_path: do nothing without RUNTIME_PREFIX | Jeff King | 2017-09-07 |
| * | | system_path: move RUNTIME_PREFIX to a sub-function | Jeff King | 2017-09-07 |
* | | | Merge branch 'bb/doc-eol-dirty' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ | |||
| * | | | Documentation: mention that `eol` can change the dirty status of paths | Ben Boeckel | 2017-09-07 |
* | | | | Merge branch 'mg/timestamp-t-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ | |||
| * | | | | name-rev: change ULONG_MAX to TIME_MAX | Michael J Gruber | 2017-09-06 |
* | | | | | Merge branch 'ma/pkt-line-leakfix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ | |||
| * | | | | | pkt-line: re-'static'-ify buffer in packet_write_fmt_1() | Martin Ågren | 2017-09-06 |
* | | | | | | Merge branch 'jk/config-lockfile-leak-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | config: use a static lock_file struct | Jeff King | 2017-09-06 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'dw/diff-highlight-makefile-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | diff-highlight: add clean target to Makefile | Daniel Watkins | 2017-09-06 |
| | |_|_|/ / | |/| | | | | |||
* | | | | | | Merge branch 'jk/drop-sha1-entry-pos' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ | |||
| * | | | | | | sha1-lookup: remove sha1_entry_pos() from header file | Christian Couder | 2017-08-25 |
| * | | | | | | sha1_file: drop experimental GIT_USE_LOOKUP search | Jeff King | 2017-08-09 |
* | | | | | | | Merge branch 'tb/ref-filter-empty-modifier' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | ref-filter.c: pass empty-string as NULL to atom parsers | Taylor Blau | 2017-10-05 |
* | | | | | | | | Merge branch 'rb/compat-poll-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | poll.c: always set revents, even if to zero | Randall S. Becker | 2017-09-29 |
* | | | | | | | | | Merge branch 'tg/memfixes' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | sub-process: use child_process.args instead of child_process.argv | Johannes Sixt | 2017-10-04 |
| * | | | | | | | | | http-push: fix construction of hex value from path | Thomas Gummerer | 2017-10-04 |
| * | | | | | | | | | path.c: fix uninitialized memory access | Jeff King | 2017-10-04 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'ar/request-pull-phrasofix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | request-pull: capitalise "Git" to make it a proper noun | Ann T Ropea | 2017-10-03 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jc/merge-x-theirs-docfix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | merge-strategies: avoid implying that "-s theirs" exists | Junio C Hamano | 2017-09-25 |
* | | | | | | | | | | Merge branch 'rs/mailinfo-qp-decode-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | mailinfo: don't decode invalid =XY quoted-printable sequences | René Scharfe | 2017-09-24 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'ik/userdiff-html-h-element-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | userdiff: fix HTML hunk header regexp | Ilya Kantor | 2017-09-24 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jk/diff-blob' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | cat-file: handle NULL object_context.path | Jeff King | 2017-09-22 |
* | | | | | | | | | | | Merge branch 'jk/describe-omit-some-refs' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | describe: fix matching to actually match all patterns | Max Kirillov | 2017-09-17 |
* | | | | | | | | | | | | Merge branch 'mh/for-each-string-list-item-empty-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | for_each_string_list_item: avoid undefined behavior for empty list | Michael Haggerty | 2017-09-20 |
* | | | | | | | | | | | | | Merge branch 'tb/test-lint-echo-e' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | test-lint: echo -e (or -E) is not portable | Torsten Bögershausen | 2017-09-21 |
| |/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | | Merge branch 'aw/gc-lockfile-fscanf-fix' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | gc: call fscanf() with %<len>s, not %<len>c, when reading hostname | Junio C Hamano | 2017-09-17 |
* | | | | | | | | | | | | | | Merge branch 'tg/refs-allowed-flags' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | refs: strip out not allowed flags from ref_transaction_update | Thomas Gummerer | 2017-09-14 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'rs/archive-excluded-directory' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | archive: don't add empty directories to archives | René Scharfe | 2017-09-14 |
* | | | | | | | | | | | | | | | Merge branch 'rk/commit-tree-make-F-verbatim' into maint | Junio C Hamano | 2017-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | commit-tree: do not complete line in -F input | Ross Kabus | 2017-09-10 |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |