summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-08-30worktree: prepare for more checks of whether path can become worktreeLibravatar Eric Sunshine1-2/+7
2018-08-30worktree: generalize delete_git_dir() to reduce code duplicationLibravatar Eric Sunshine1-16/+9
2018-08-30worktree: move delete_git_dir() earlier in file for upcoming new callersLibravatar Eric Sunshine1-14/+14
2018-08-30worktree: don't die() in library function find_worktree()Libravatar Eric Sunshine2-1/+13
2018-08-30am: avoid directory rename detection when calling recursive merge machineryLibravatar Elijah Newren2-2/+3
2018-08-30merge-recursive: add ability to turn off directory rename detectionLibravatar Elijah Newren2-5/+14
2018-08-30t3401: add another directory rename testcase for rebase and amLibravatar Elijah Newren1-1/+109
2018-08-29mailinfo: support format=flowedLibravatar René Scharfe7-2/+2646
2018-08-29Documentation/Makefile: make manpage-base-url.xsl generation quieterLibravatar Tim Schumacher1-1/+1
2018-08-29show_dirstat: simplify same-content checkLibravatar Jeff King1-8/+3
2018-08-29read-cache: use oideq() in ce_compare functionsLibravatar Jeff King1-2/+2
2018-08-29convert hashmap comparison functions to oideq()Libravatar Jeff King3-13/+13
2018-08-29convert "hashcmp() != 0" to "!hasheq()"Libravatar Jeff King12-15/+24
2018-08-29convert "oidcmp() != 0" to "!oideq()"Libravatar Jeff King31-49/+55
2018-08-29convert "hashcmp() == 0" to hasheq()Libravatar Jeff King8-14/+23
2018-08-29convert "oidcmp() == 0" to oideq()Libravatar Jeff King52-111/+117
2018-08-29introduce hasheq() and oideq()Libravatar Jeff King1-0/+10
2018-08-29coccinelle: use <...> for function exclusionLibravatar Jeff King3-13/+13
2018-08-29.gitattributes: add conflict-marker-size for relevant filesLibravatar Thomas Gummerer1-0/+4
2018-08-29chainlint: match "quoted" here-doc tagsLibravatar Eric Sunshine5-4/+18
2018-08-29commit-graph: define GIT_TEST_COMMIT_GRAPHLibravatar Derrick Stolee8-12/+22
2018-08-29tests: fix non-portable iconv invocationLibravatar Ævar Arnfjörð Bjarmason1-1/+5
2018-08-29tests: fix non-portable "${var:-"str"}" constructLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2018-08-29rerere: add note about files with existing conflict markersLibravatar Thomas Gummerer1-0/+6
2018-08-29rerere: mention caveat about unmatched conflict markersLibravatar Thomas Gummerer1-0/+4
2018-08-28commit-reach: correct accidental #include of C fileLibravatar Jonathan Nieder1-1/+1
2018-08-28Git 2.19-rc1Libravatar Junio C Hamano1-1/+1
2018-08-28l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-3496/+6652
2018-08-27Getting ready for -rc1Libravatar Junio C Hamano1-1/+34
2018-08-27Merge branch 'ja/i18n-message-fixes'Libravatar Junio C Hamano3-3/+3
2018-08-27Merge branch 'ds/commit-graph-fsck'Libravatar Junio C Hamano1-6/+11
2018-08-27Merge branch 'js/range-diff'Libravatar Junio C Hamano1-1/+1
2018-08-27Merge branch 'sg/test-rebase-editor-fix'Libravatar Junio C Hamano1-3/+3
2018-08-27Merge branch 'jk/hashcmp-optim-for-2.19'Libravatar Junio C Hamano1-0/+10
2018-08-27Merge branch 'ab/test-must-be-empty-for-master'Libravatar Junio C Hamano1-1/+1
2018-08-27Merge branch 'sg/t3420-autostash-fix'Libravatar Junio C Hamano1-4/+4
2018-08-27Merge branch 'sg/t3903-missing-fix'Libravatar Junio C Hamano1-1/+1
2018-08-27Merge branch 'sg/t7501-thinkofix'Libravatar Junio C Hamano1-1/+1
2018-08-27Merge branch 'sg/t0020-conversion-fix'Libravatar Junio C Hamano1-1/+1
2018-08-27Merge branch 'sg/t4051-fix'Libravatar Junio C Hamano1-1/+1
2018-08-27Merge branch 'js/larger-timestamps'Libravatar Junio C Hamano1-1/+1
2018-08-27Merge branch 'jk/use-compat-util-in-test-tool'Libravatar Junio C Hamano1-0/+2
2018-08-27Merge branch 'sg/test-must-be-empty'Libravatar Junio C Hamano77-344/+231
2018-08-27Merge branch 'rs/opt-updates'Libravatar Junio C Hamano5-6/+6
2018-08-27Merge branch 'nd/complete-config-vars'Libravatar Junio C Hamano4-14/+14
2018-08-27Merge branch 'ab/unconditional-free-and-null'Libravatar Junio C Hamano4-12/+4
2018-08-27Merge branch 'ep/worktree-quiet-option'Libravatar Junio C Hamano3-3/+22
2018-08-27Merge branch 'sm/branch-sort-config'Libravatar Junio C Hamano4-3/+64
2018-08-27Merge branch 'nd/config-core-checkstat-doc'Libravatar Junio C Hamano1-4/+14
2018-08-27tests: fix and add lint for non-portable grep --fileLibravatar Ævar Arnfjörð Bjarmason2-1/+2