summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' into maintJunio C Hamano2017-10-181-0/+2
|\ \ \ \ \ \
| * | | | | | doc: put literal block delimiter around tablejk/doc-read-tree-table-asciidoctor-fixJeff King2017-09-241-0/+2
* | | | | | | Merge branch 'hn/typofix' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | submodule.h: typofixhn/typofixHan-Wen Nienhuys2017-09-221-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ks/test-readme-phrasofix' into maintJunio C Hamano2017-10-181-3/+3
|\ \ \ \ \ \ \
| * | | | | | | t/README: fix typo and grammatically improve a sentenceks/test-readme-phrasofixKaartic Sivaraam2017-09-191-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'ez/doc-duplicated-words-fix' into maintJunio C Hamano2017-10-184-4/+4
|\ \ \ \ \ \ \
| * | | | | | | doc: fix minor typos (extra/duplicated words)ez/doc-duplicated-words-fixEvan Zacks2017-09-144-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'kd/doc-for-each-ref' into maintJunio C Hamano2017-10-181-16/+17
|\ \ \ \ \ \ \
| * | | | | | | doc/for-each-ref: explicitly specify option nameskd/doc-for-each-refKevin Daudt2017-09-121-9/+9
| * | | | | | | doc/for-each-ref: consistently use '=' to between argument names and valuesKevin Daudt2017-09-121-7/+8
* | | | | | | | Merge branch 'cc/subprocess-handshake-missing-capabilities' into maintJunio C Hamano2017-10-181-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | subprocess: loudly die when subprocess asks for an unsupported capabilitycc/subprocess-handshake-missing-capabilitiesJunio C Hamano2017-09-111-2/+2
* | | | | | | | | Merge branch 'jk/system-path-cleanup' into maintJunio C Hamano2017-10-181-14/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git_extract_argv0_path: do nothing without RUNTIME_PREFIXjk/system-path-cleanupJeff King2017-09-071-14/+19
| * | | | | | | | | system_path: move RUNTIME_PREFIX to a sub-functionJeff King2017-09-071-12/+21
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bb/doc-eol-dirty' into maintJunio C Hamano2017-10-181-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: mention that `eol` can change the dirty status of pathsbb/doc-eol-dirtyBen Boeckel2017-09-071-1/+4
* | | | | | | | | | Merge branch 'mg/timestamp-t-fix' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | name-rev: change ULONG_MAX to TIME_MAXmg/timestamp-t-fixMichael J Gruber2017-09-061-1/+1
* | | | | | | | | | | Merge branch 'ma/pkt-line-leakfix' into maintJunio C Hamano2017-10-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pkt-line: re-'static'-ify buffer in packet_write_fmt_1()ma/pkt-line-leakfixMartin Ågren2017-09-061-1/+2
* | | | | | | | | | | | Merge branch 'jk/config-lockfile-leak-fix' into maintJunio C Hamano2017-10-181-17/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | config: use a static lock_file structjk/config-lockfile-leak-fixJeff King2017-09-061-17/+7
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dw/diff-highlight-makefile-fix' into maintJunio C Hamano2017-10-181-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff-highlight: add clean target to Makefiledw/diff-highlight-makefile-fixDaniel Watkins2017-09-061-0/+3
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/drop-sha1-entry-pos' into maintJunio C Hamano2017-10-185-244/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sha1-lookup: remove sha1_entry_pos() from header filejk/drop-sha1-entry-posChristian Couder2017-08-251-6/+0
| * | | | | | | | | | | | sha1_file: drop experimental GIT_USE_LOOKUP searchJeff King2017-08-094-238/+1
* | | | | | | | | | | | | Merge branch 'tb/ref-filter-empty-modifier' into maintJunio C Hamano2017-10-182-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ref-filter.c: pass empty-string as NULL to atom parserstb/ref-filter-empty-modifierTaylor Blau2017-10-052-1/+10
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rb/compat-poll-fix' into maintJunio C Hamano2017-10-181-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | poll.c: always set revents, even if to zerorb/compat-poll-fixRandall S. Becker2017-09-291-0/+4
* | | | | | | | | | | | | | Merge branch 'tg/memfixes' into maintJunio C Hamano2017-10-183-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | sub-process: use child_process.args instead of child_process.argvtg/memfixesJohannes Sixt2017-10-041-2/+1
| * | | | | | | | | | | | | | http-push: fix construction of hex value from pathThomas Gummerer2017-10-041-1/+1
| * | | | | | | | | | | | | | path.c: fix uninitialized memory accessJeff King2017-10-041-5/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ar/request-pull-phrasofix' into maintJunio C Hamano2017-10-182-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | request-pull: capitalise "Git" to make it a proper nounar/request-pull-phrasofixAnn T Ropea2017-10-032-3/+3
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/merge-x-theirs-docfix' into maintJunio C Hamano2017-10-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | merge-strategies: avoid implying that "-s theirs" existsjc/merge-x-theirs-docfixJunio C Hamano2017-09-251-1/+2
* | | | | | | | | | | | | | | Merge branch 'rs/mailinfo-qp-decode-fix' into maintJunio C Hamano2017-10-181-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mailinfo: don't decode invalid =XY quoted-printable sequencesrs/mailinfo-qp-decode-fixRené Scharfe2017-09-241-3/+8
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ik/userdiff-html-h-element-fix' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | userdiff: fix HTML hunk header regexpik/userdiff-html-h-element-fixIlya Kantor2017-09-241-1/+1
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-10-182-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | cat-file: handle NULL object_context.pathjk/diff-blobJeff King2017-09-222-2/+7
* | | | | | | | | | | | | | | | Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2017-10-182-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | describe: fix matching to actually match all patternsjk/describe-omit-some-refsMax Kirillov2017-09-172-4/+11
* | | | | | | | | | | | | | | | | Merge branch 'mh/for-each-string-list-item-empty-fix' into maintJunio C Hamano2017-10-181-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \