summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2018-08-02Merge branch 'en/t6036-merge-recursive-tests'Libravatar Junio C Hamano1-0/+451
2018-08-02Merge branch 'en/dirty-merge-fixes'Libravatar Junio C Hamano9-179/+124
2018-08-02Merge branch 'js/rebase-merge-octopus'Libravatar Junio C Hamano5-47/+204
2018-08-02Merge branch 'tb/grep-only-matching'Libravatar Junio C Hamano5-34/+86
2018-08-02Merge branch 'kg/gc-auto-windows-workaround'Libravatar Junio C Hamano2-0/+3
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Libravatar Junio C Hamano16-134/+515
2018-08-02Merge branch 'jt/fetch-nego-tip'Libravatar Junio C Hamano8-2/+176
2018-08-02Merge branch 'en/t6042-insane-merge-rename-testcases'Libravatar Junio C Hamano1-0/+245
2018-08-02Merge branch 'sb/object-store-lookup'Libravatar Junio C Hamano82-361/+487
2018-08-02Merge branch 'is/parsing-line-range'Libravatar Junio C Hamano6-14/+17
2018-08-02Merge branch 'jt/fetch-pack-negotiator'Libravatar Junio C Hamano8-169/+373
2018-08-02Merge branch 'ab/checkout-default-remote'Libravatar Junio C Hamano11-16/+197
2018-08-02Merge branch 'sb/diff-color-move-more'Libravatar Junio C Hamano7-88/+489
2018-08-02Merge branch 'es/test-fixes'Libravatar Junio C Hamano104-590/+569
2018-08-02Merge branch 'ds/commit-graph-fsck'Libravatar Junio C Hamano14-83/+575
2018-08-02Merge branch 'jk/fsck-gitmodules-gently'Libravatar Junio C Hamano5-15/+56
2018-08-02Merge branch 'bc/object-id'Libravatar Junio C Hamano15-49/+56
2018-08-02Merge branch 'en/t6036-recursive-corner-cases'Libravatar Junio C Hamano1-55/+201
2018-08-02Merge branch 'sg/httpd-test-unflake'Libravatar Junio C Hamano4-36/+29
2018-08-02Merge branch 'bp/test-drop-caches-for-windows'Libravatar Junio C Hamano1-2/+2
2018-08-02Merge branch 'jk/has-uncommitted-changes-fix'Libravatar Junio C Hamano3-0/+25
2018-08-02sha1dc: update from upstreamLibravatar Ævar Arnfjörð Bjarmason2-1/+11
2018-08-02score_trees(): fix iteration over trees with missing entriesLibravatar Jeff King2-17/+54
2018-08-02remote: make refspec follow the same disambiguation rule as local refsLibravatar Junio C Hamano3-8/+58
2018-08-01fetch-pack: unify ref in and out paramLibravatar Jonathan Tan9-84/+50
2018-08-01git-p4: add the `p4-pre-submit` hookLibravatar Chen Bin4-1/+59
2018-08-01xdiff: reduce indent heuristic overheadLibravatar Stefan Beller1-1/+11
2018-08-01t1300: document current behavior of setting optionsLibravatar Stefan Beller1-0/+86
2018-08-01fetch doc: cross-link two new negotiation optionsLibravatar Ævar Arnfjörð Bjarmason2-0/+5
2018-08-01negotiator: unknown fetch.negotiationAlgorithm should error outLibravatar Ævar Arnfjörð Bjarmason3-4/+34
2018-08-01Merge branch 'jt/fetch-nego-tip' into ab/fetch-negoLibravatar Junio C Hamano8-2/+176
2018-08-01travis-ci: include the trash directories of failed tests in the trace logLibravatar SZEDER Gábor3-3/+104
2018-08-01remote: clear string_list after use in mv()Libravatar René Scharfe1-2/+3
2018-07-31read-cache: fix directory/file conflict handling in read_index_unmerged()Libravatar Elijah Newren4-14/+12
2018-07-31t1015: demonstrate directory/file conflict recovery failuresLibravatar Elijah Newren1-0/+123
2018-07-31sequencer: don't die() on bogus user-edited timestampLibravatar Eric Sunshine1-0/+9
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timestampLibravatar Eric Sunshine2-15/+10
2018-07-31sequencer: fix "rebase -i --root" corrupting author header timezoneLibravatar Eric Sunshine2-2/+7
2018-07-31sequencer: fix "rebase -i --root" corrupting author headerLibravatar Eric Sunshine2-2/+10
2018-07-31t/chainlint.sed: drop extra spaces from regex character classLibravatar Eric Sunshine1-4/+4
2018-07-31mw-to-git/t9360: fix broken &&-chainLibravatar Eric Sunshine1-1/+1
2018-07-31push tests: assert re-pushing annotated tagsLibravatar Ævar Arnfjörð Bjarmason1-37/+45
2018-07-31push tests: add more testing for forced tag pushingLibravatar Ævar Arnfjörð Bjarmason1-2/+20
2018-07-31push tests: fix logic error in "push" test assertionLibravatar Ævar Arnfjörð Bjarmason1-2/+2
2018-07-31push tests: remove redundant 'git push' invocationLibravatar Ævar Arnfjörð Bjarmason1-1/+0
2018-07-31fetch tests: change "Tag" test tag to "testTag"Libravatar Ævar Arnfjörð Bjarmason1-9/+9
2018-07-30subtree test: simplify preparation of expected resultsLibravatar Jonathan Nieder1-89/+30
2018-07-30subtree test: add missing && to &&-chainLibravatar Jonathan Nieder1-1/+1
2018-07-30vscode: let cSpell work on commit messages, tooLibravatar Johannes Schindelin1-0/+2
2018-07-30vscode: add a dictionary for cSpellLibravatar Johannes Schindelin1-1/+168