summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2018-05-08merge: add merge.renames config settingLibravatar Ben Peart1-0/+18
2018-05-08merge-recursive: fix check for skipability of working tree updatesLibravatar Elijah Newren3-7/+7
2018-05-08t6046: testcases checking whether updates can be skipped in a mergeLibravatar Elijah Newren1-0/+761
2018-05-08merge-recursive: avoid triggering add_cacheinfo error with dirty modLibravatar Elijah Newren1-1/+1
2018-05-08merge-recursive: improve add_cacheinfo error handlingLibravatar Elijah Newren1-4/+3
2018-05-08merge-recursive: avoid spurious rename/rename conflict from dir renamesLibravatar Elijah Newren1-30/+25
2018-05-08directory rename detection: new testcases showcasing a pair of bugsLibravatar Elijah Newren1-0/+296
2018-05-08merge-recursive: fix remaining directory rename + dirty overwrite casesLibravatar Elijah Newren1-4/+4
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren3-3/+3
2018-05-08merge-recursive: avoid clobbering untracked files with directory renamesLibravatar Elijah Newren1-3/+3
2018-05-08merge-recursive: apply necessary modifications for directory renamesLibravatar Elijah Newren1-25/+25
2018-05-08merge-recursive: check for file level conflicts then get new nameLibravatar Elijah Newren1-1/+1
2018-05-08Merge branch 'ma/http-walker-no-partial'Libravatar Junio C Hamano1-0/+11
2018-05-08Merge branch 'js/colored-push-errors'Libravatar Junio C Hamano1-0/+12
2018-05-08Merge branch 'jc/parseopt-expiry-errors'Libravatar Junio C Hamano1-0/+10
2018-05-08Merge branch 'ma/fast-export-skip-merge-fix'Libravatar Junio C Hamano1-0/+18
2018-05-08Merge branch 'bt/gpg-interface'Libravatar Junio C Hamano1-1/+12
2018-05-08Merge branch 'hn/sort-ls-remote'Libravatar Junio C Hamano1-7/+47
2018-05-08Merge branch 'tb/config-default'Libravatar Junio C Hamano2-0/+66
2018-05-08Merge branch 'tb/config-type'Libravatar Junio C Hamano1-1/+64
2018-05-08Merge branch 'tq/t1510'Libravatar Junio C Hamano1-1/+0
2018-05-08Merge branch 'ls/checkout-encoding'Libravatar Junio C Hamano1-0/+245
2018-05-08Merge branch 'sb/object-store-replace'Libravatar Junio C Hamano1-1/+2
2018-05-08Merge branch 'ds/commit-graph'Libravatar Junio C Hamano1-0/+224
2018-05-08Merge branch 'js/empty-config-section-fix'Libravatar Junio C Hamano1-3/+99
2018-05-08Merge branch 'sb/submodule-move-nested'Libravatar Junio C Hamano2-4/+6
2018-05-08Merge branch 'dj/runtime-prefix'Libravatar Junio C Hamano1-1/+1
2018-05-08Merge branch 'bw/protocol-v2'Libravatar Junio C Hamano3-0/+513
2018-05-06Replace all die("BUG: ...") calls by BUG() onesLibravatar Johannes Schindelin1-8/+8
2018-05-06test-tool: help verifying BUG() code pathsLibravatar Johannes Schindelin1-0/+2
2018-05-06rebase -i --root: let the sequencer handle even the initial partLibravatar Johannes Schindelin2-9/+16
2018-05-06rebase --rebase-merges: root commits can be cousins, tooLibravatar Johannes Schindelin1-0/+25
2018-05-06rebase --rebase-merges: a "merge" into a new root is a fast-forwardLibravatar Johannes Schindelin1-0/+13
2018-05-06sequencer: allow introducing new root commitsLibravatar Johannes Schindelin1-0/+34
2018-05-06{fetch,upload}-pack: support filter in protocol v2Libravatar Jonathan Tan1-0/+98
2018-05-06upload-pack: read config when serving protocol v2Libravatar Jonathan Tan1-0/+14
2018-05-06perf/bisect_run_script: disable codespeedLibravatar Christian Couder1-0/+6
2018-05-06wt-status: use settings from git_diff_ui_configLibravatar Eckhard S. Maaß1-0/+12
2018-05-04test-drop-caches: simplify delay loading of NtSetSystemInformationLibravatar Ben Peart1-12/+4
2018-05-02upload-pack: fix error message typoLibravatar Jonathan Tan1-0/+14
2018-05-02Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2Libravatar Junio C Hamano3-0/+513
2018-05-02dir: convert struct untracked_cache_dir to object_idLibravatar brian m. carlson1-1/+1
2018-05-02Update struct index_state to use struct object_idLibravatar brian m. carlson1-1/+1
2018-05-02split-index: convert struct split_index to object_idLibravatar brian m. carlson1-1/+1
2018-05-02format-patch: make cover letters always text/plainLibravatar brian m. carlson1-0/+9
2018-05-02test: correct detection of UTF8_NFD_TO_NFC for APFSLibravatar Torsten Bögershausen1-6/+1
2018-05-02rebase --skip: clean up commit message after a failed fixup/squashLibravatar Johannes Schindelin1-4/+31
2018-05-02rebase -i: demonstrate bugs with fixup!/squash! commit messagesLibravatar Johannes Schindelin1-0/+22
2018-04-30Deprecate support for .git/info/graftsLibravatar Johannes Schindelin1-0/+9
2018-04-30Add a test for `git replace --convert-graft-file`Libravatar Johannes Schindelin1-0/+28