summaryrefslogtreecommitdiffstats
path: root/t/t6037-merge-ours-theirs.sh (unfollow)
Commit message (Expand)AuthorFilesLines
2018-09-27Git 2.19.1v2.19.1Junio C Hamano3-2/+8
2018-09-27Git 2.18.1v2.18.1Junio C Hamano3-2/+8
2018-09-27Git 2.17.2v2.17.2Junio C Hamano3-2/+14
2018-09-27fsck: detect submodule paths starting with dashJeff King2-0/+15
2018-09-27fsck: detect submodule urls starting with dashJeff King2-0/+22
2018-09-27Git 2.16.5v2.16.5Junio C Hamano3-2/+8
2018-09-27Git 2.15.3v2.15.3Junio C Hamano3-2/+8
2018-09-27Git 2.14.5v2.14.5Junio C Hamano3-2/+18
2018-09-27submodule-config: ban submodule paths that start with a dashJeff King2-0/+22
2018-09-27submodule-config: ban submodule urls that start with dashJeff King2-0/+42
2018-09-27submodule--helper: use "--" to signal end of clone optionsJeff King1-0/+1
2018-09-24Second batch post 2.19Junio C Hamano1-0/+55
2018-09-21commit-reach: fix memory and flag leaksDerrick Stolee1-0/+5
2018-09-21commit-reach: properly peel tagsDerrick Stolee3-14/+74
2018-09-21add: do not accept pathspec magic 'attr'Nguyễn Thái Ngọc Duy2-2/+2
2018-09-20fetch doc: correct grammar in --force docsÆvar Arnfjörð Bjarmason1-2/+2
2018-09-19push doc: add spacing between two wordsÆvar Arnfjörð Bjarmason1-1/+1
2018-09-19config doc: add missing list separator for checkout.optimizeNewBranchÆvar Arnfjörð Bjarmason1-1/+1
2018-09-17Initial batch post 2.19Junio C Hamano2-2/+113
2018-09-17Revert "doc/Makefile: drop doc-diff worktree and temporary files on "make cle...Junio C Hamano1-1/+0
2018-09-14builtin/remote: quote remote name on error to display empty nameShulhan2-5/+5
2018-09-14linear-assignment: fix potential out of bounds memory accessThomas Gummerer2-0/+11
2018-09-13fetch-object: set exact_oid when fetchingJonathan Tan2-0/+13
2018-09-13fetch-object: unify fetch_object[s] functionsJonathan Tan4-19/+9
2018-09-13sequencer: fix --allow-empty-message behavior, make it smarterElijah Newren4-17/+14
2018-09-13update-ref: allow --no-deref with --stdinElijah Newren3-11/+45
2018-09-13update-ref: fix type of update_flags variable to match its usageElijah Newren1-1/+1
2018-09-13Make git_check_attr() a void functionTorsten Bögershausen9-69/+57
2018-09-12t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split indexSZEDER Gábor1-7/+10
2018-09-12t1700-split-index: drop unnecessary 'grep'SZEDER Gábor1-1/+1
2018-09-12config.txt: move submodule part out to a separate fileNguyễn Thái Ngọc Duy2-82/+83
2018-09-12config.txt: move sequence.editor out of "core" partNguyễn Thái Ngọc Duy1-6/+6
2018-09-12config.txt: move sendemail part out to a separate fileNguyễn Thái Ngọc Duy2-63/+64
2018-09-12config.txt: move receive part out to a separate fileNguyễn Thái Ngọc Duy2-123/+124
2018-09-12config.txt: move push part out to a separate fileNguyễn Thái Ngọc Duy2-113/+114
2018-09-12config.txt: move pull part out to a separate fileNguyễn Thái Ngọc Duy2-36/+37
2018-09-12config.txt: move gui part out to a separate fileNguyễn Thái Ngọc Duy2-57/+58
2018-09-12config.txt: move gitcvs part out to a separate fileNguyễn Thái Ngọc Duy2-67/+68
2018-09-12config.txt: move format part out to a separate fileNguyễn Thái Ngọc Duy2-87/+88
2018-09-12config.txt: move fetch part out to a separate fileNguyễn Thái Ngọc Duy2-65/+66
2018-09-12config.txt: follow camelCase namingNguyễn Thái Ngọc Duy1-1/+1
2018-09-12t3206-range-diff.sh: cover single-patch caseDerrick Stolee1-0/+5
2018-09-12git-mv: allow submodules and fsmonitor to work togetherBen Peart1-2/+1
2018-09-11http-backend test: make empty CONTENT_LENGTH test more realisticMax Kirillov1-2/+2
2018-09-11mingw: fix mingw_open_append to work with named pipesJeff Hostetler2-4/+34
2018-09-11t0051: test GIT_TRACE to a windows named pipeJeff Hostetler5-0/+96
2018-09-11rerere: avoid buffer overrunElijah Newren2-2/+2
2018-09-11t4200: demonstrate rerere segfault on specially crafted mergeElijah Newren1-0/+29
2018-09-11diff: fix --color-moved-ws=allow-indentation-changePhillip Wood1-5/+6
2018-09-11t3701-add-interactive: tighten the check of trace outputSZEDER Gábor1-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 00:21:29 +0100