summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | t3203: drop "always" color testJeff King2017-10-041-6/+0
| | * | | | | | | | | t6006: drop "always" color config testsJeff King2017-10-041-15/+5
| | * | | | | | | | | t7502: use diff.noprefix for --verbose testJeff King2017-10-041-2/+2
| | * | | | | | | | | t7508: use test_terminal for color outputJeff King2017-10-041-20/+21
| | * | | | | | | | | t3701: use test-terminal to collect color outputJeff King2017-10-041-5/+3
| | * | | | | | | | | t4015: prefer --color to -c color.diff=alwaysJeff King2017-10-041-14/+14
| | * | | | | | | | | test-terminal: set TERM=vt100Jeff King2017-10-047-10/+9
| * | | | | | | | | | t7301: use test_terminal to check colorJeff King2017-10-041-2/+3
| * | | | | | | | | | t4015: use --color with --color-movedJeff King2017-10-041-13/+12
* | | | | | | | | | | Merge branch 'ma/builtin-unleak'Junio C Hamano2017-10-075-4/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/: add UNLEAKsma/builtin-unleakMartin Ågren2017-10-025-4/+11
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rb/compat-poll-fix'Junio C Hamano2017-10-071-0/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | poll.c: always set revents, even if to zerorb/compat-poll-fixRandall S. Becker2017-09-291-0/+4
* | | | | | | | | | | | Merge branch 'tg/memfixes'Junio C Hamano2017-10-073-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 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano2017-10-071-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | branch: reset instead of release a strbufsb/branch-avoid-repeated-strbuf-releaseStefan Beller2017-10-041-2/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rs/qsort-s'Junio C Hamano2017-10-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test-stringlist: avoid buffer underrun when sorting nothingrs/qsort-sRené Scharfe2017-10-041-1/+1
* | | | | | | | | | | | | Merge branch 'jn/strbuf-doc-re-reuse'Junio C Hamano2017-10-071-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | strbuf doc: reuse after strbuf_release is finejn/strbuf-doc-re-reuseJonathan Nieder2017-10-041-2/+9
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano2017-10-072-7/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | pretty.c: delimit "%(trailers)" arguments with ","Taylor Blau2017-10-022-7/+30
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Git 2.15-rc0v2.15.0-rc0Junio C Hamano2017-10-052-1/+17
* | | | | | | | | | | Merge branch 'ar/request-pull-phrasofix'Junio C Hamano2017-10-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | request-pull: capitalise "Git" to make it a proper nounar/request-pull-phrasofixAnn T Ropea2017-10-032-3/+3
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/run-command-use-alloc-array'Junio C Hamano2017-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | run-command: use ALLOC_ARRAYrs/run-command-use-alloc-arrayRené Scharfe2017-10-031-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sb/git-clang-format'Junio C Hamano2017-10-051-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clang-format: add a comment about the meaning/status of thesb/git-clang-formatStephan Beyer2017-10-021-1/+5
* | | | | | | | | | | | Merge branch 'rs/use-free-and-null'Junio C Hamano2017-10-051-18/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | repository: use FREE_AND_NULLrs/use-free-and-nullRené Scharfe2017-10-021-18/+9
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/tag-null-pointer-arith-fix'Junio C Hamano2017-10-051-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tag: avoid NULL pointer arithmeticrs/tag-null-pointer-arith-fixRené Scharfe2017-10-021-4/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/cocci-de-paren-call-params'Junio C Hamano2017-10-051-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | coccinelle: remove parentheses that become unnecessaryrs/cocci-de-paren-call-paramsRené Scharfe2017-10-021-5/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-055-12/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | graph: use strbuf_addchars() to add spacesrs/cleanup-strbuf-usersRené Scharfe2017-10-021-7/+3
| * | | | | | | | | | | | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-023-4/+4
| * | | | | | | | | | | | path: use strbuf_add_real_path()René Scharfe2017-10-021-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-10-057-20/+9
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | refs: pass NULL to resolve_refdup() if hash is not neededrs/resolve-ref-optional-resultRené Scharfe2017-10-016-18/+8
| * | | | | | | | | | | | refs: pass NULL to refs_resolve_refdup() if hash is not neededRené Scharfe2017-10-011-2/+1
* | | | | | | | | | | | | Merge branch 'er/fast-import-dump-refs-on-checkpoint'Junio C Hamano2017-10-052-3/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | fast-import: checkpoint: dump branches/tags/marks even if object_count==0er/fast-import-dump-refs-on-checkpointEric Rannaud2017-09-292-3/+145
* | | | | | | | | | | | | The twelfth batch for 2.15Junio C Hamano2017-10-031-0/+24
* | | | | | | | | | | | | Merge branch 'bw/git-clang-format'Junio C Hamano2017-10-031-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | clang-format: adjust line break penaltiesbw/git-clang-formatJohannes Schindelin2017-10-011-6/+6