summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* run-command: use BUG() to report bugs, not die()Johannes Schindelin2018-05-061-13/+10
* test-tool: help verifying BUG() code pathsJohannes Schindelin2018-05-062-0/+7
* The fourth batch for 2.18Junio C Hamano2018-04-251-0/+78
* Merge branch 'jm/mem-pool'Junio C Hamano2018-04-254-61/+106
|\
| * mem-pool: move reusable parts of memory pool into its own fileJameson Miller2018-04-124-69/+91
| * fast-import: introduce mem_pool typeJameson Miller2018-04-121-29/+52
| * fast-import: rename mem_pool type to mp_blockJameson Miller2018-04-121-10/+10
* | Merge branch 'tg/use-git-contacts'Junio C Hamano2018-04-251-2/+2
|\ \
| * | SubmittingPatches: mention the git contacts commandThomas Gummerer2018-04-121-2/+2
* | | Merge branch 'sb/filenames-with-dashes'Junio C Hamano2018-04-2542-45/+45
|\ \ \
| * | | replace_object.c: rename to use dash in file nameStefan Beller2018-04-112-1/+1
| * | | sha1_file.c: rename to use dash in file nameStefan Beller2018-04-114-3/+3
| * | | sha1_name.c: rename to use dash in file nameStefan Beller2018-04-114-3/+3
| * | | exec_cmd: rename to use dash in file nameStefan Beller2018-04-1131-32/+32
| * | | unicode_width.h: rename to use dash in file nameStefan Beller2018-04-114-5/+5
| * | | write_or_die.c: rename to use dashes in file nameStefan Beller2018-04-112-1/+1
* | | | Merge branch 'cc/perf-bisect'Junio C Hamano2018-04-253-10/+166
|\ \ \ \
| * | | | t/perf: add scripts to bisect performance regressionsChristian Couder2018-04-112-0/+120
| * | | | perf/run: add --subsection optionChristian Couder2018-04-111-10/+46
* | | | | Merge branch 'bp/fsmonitor-prime-index'Junio C Hamano2018-04-251-0/+3
|\ \ \ \ \
| * | | | | fsmonitor: force index write after full scanBen Peart2018-04-111-0/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'bp/fsmonitor-bufsize-fix'Junio C Hamano2018-04-251-1/+1
|\ \ \ \ \
| * | | | | fsmonitor: fix incorrect buffer size when printing version numberBen Peart2018-04-111-1/+1
* | | | | | Merge branch 'cb/bash-completion-ls-files-processing'Junio C Hamano2018-04-251-6/+1
|\ \ \ \ \ \
| * | | | | | completion: improve ls-files filter performanceClemens Buchacher2018-04-101-6/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'es/worktree-docs'Junio C Hamano2018-04-251-9/+9
|\ \ \ \ \ \
| * | | | | | git-worktree.txt: unify command-line prompt in example blocksEric Sunshine2018-04-091-2/+2
| * | | | | | git-worktree.txt: recommend 'git worktree remove' over manual deletionEric Sunshine2018-04-091-7/+7
* | | | | | | Merge branch 'es/fread-reads-dir-autoconf-fix'Junio C Hamano2018-04-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | configure.ac: fix botched FREAD_READS_DIRECTORIES checkEric Sunshine2018-04-091-1/+1
* | | | | | | | Merge branch 'ps/test-chmtime-get'Junio C Hamano2018-04-2510-42/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | t/helper: 'test-chmtime (--get|-g)' to print only the mtimePaul-Sebastian Ungureanu2018-04-0910-42/+63
* | | | | | | | | Merge branch 'js/t5404-path-fix'Junio C Hamano2018-04-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5404: relax overzealous testJohannes Schindelin2018-04-091-1/+1
* | | | | | | | | | Merge branch 'jk/ref-array-push'Junio C Hamano2018-04-254-14/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ref-filter: factor ref_array pushing into its own functionJeff King2018-04-092-3/+21
| * | | | | | | | | | ref-filter: make ref_array_item allocation more consistentJeff King2018-04-091-7/+11
| * | | | | | | | | | ref-filter: use "struct object_id" consistentlyJeff King2018-04-094-8/+8
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'en/doc-typoes'Junio C Hamano2018-04-257-8/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: normalize spelling of 'normalised'Elijah Newren2018-04-091-1/+1
| * | | | | | | | | | Documentation: fix several one-character-off spelling errorsElijah Newren2018-04-096-7/+7
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'lw/daemon-log-destination'Junio C Hamano2018-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | daemon.c: fix condition for redirecting stderrLucas Werkmeister2018-04-091-1/+1
* | | | | | | | | | | Merge branch 'mn/send-email-credential-doc'Junio C Hamano2018-04-251-10/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | send-email: simplify Gmail example in the documentationMichal Nazarewicz2018-04-081-10/+6
* | | | | | | | | | | | Merge branch 'ak/bisect-doc-typofix'Junio C Hamano2018-04-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Documentation/git-bisect.txt: git bisect term → git bisect termsAnders Kaseorg2018-04-071-2/+2
* | | | | | | | | | | | | Merge branch 'br/mergetools-guiffy'Junio C Hamano2018-04-251-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mergetools: add support for guiffyBill Ritcher2018-04-061-0/+18
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nd/worktree-move'Junio C Hamano2018-04-251-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |