summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2016-04-25Merge branch 'en/merge-octopus-fix'Libravatar Junio C Hamano1-0/+153
2016-04-25Merge branch 'dt/pre-refs-backend'Libravatar Junio C Hamano2-11/+131
2016-04-25Merge branch 'jc/rerere-multi'Libravatar Junio C Hamano1-1/+169
2016-04-25difftool/mergetool: make the form of yes/no questions consistentLibravatar Nikola Forró1-1/+1
2016-04-24t9824: fix broken &&-chain in a subshellLibravatar SZEDER Gábor1-1/+1
2016-04-24git-rebase--merge: don't include absent parent as a baseLibravatar Ben Woosley2-2/+11
2016-04-22Merge branch 'jk/use-write-script-more'Libravatar Junio C Hamano3-18/+20
2016-04-22Merge branch 'ad/commit-have-m-option'Libravatar Junio C Hamano1-0/+20
2016-04-22Merge branch 'sb/submodule-helper-clone-regression-fix'Libravatar Junio C Hamano1-0/+41
2016-04-22test-lib: simplify '--option=value' parsingLibravatar SZEDER Gábor1-5/+5
2016-04-22name-rev: include taggerdate in considering the best nameLibravatar Johannes Schindelin1-1/+1
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Libravatar Junio C Hamano1-0/+21
2016-04-21t3033: avoid 'ambiguous refs' warningLibravatar Junio C Hamano1-1/+1
2016-04-20t5504: drop sigpipe=ok from push testsLibravatar Jeff King1-6/+4
2016-04-19git-p4: add P4 jobs to git commit messageLibravatar Jan Durovec2-0/+108
2016-04-19git-p4: clean-up code style in testsLibravatar Jan Durovec2-42/+42
2016-04-19mv: allow moving nested submodulesLibravatar Stefan Beller1-0/+16
2016-04-18t7030: test verifying multiple tagsLibravatar Santiago Torres1-0/+13
2016-04-18Merge branch 'jk/branch-shortening-funny-symrefs'Libravatar Junio C Hamano1-0/+12
2016-04-18Merge branch 'ky/branch-m-worktree'Libravatar Junio C Hamano1-1/+22
2016-04-16submodule: port resolve_relative_url from shell to CLibravatar Stefan Beller1-0/+46
2016-04-15test helpers: move test-* to t/helper/ subdirectoryLibravatar Nguyễn Thái Ngọc Duy37-3/+2319
2016-04-14Merge branch 'jv/merge-nothing-into-void' into maintLibravatar Junio C Hamano1-0/+10
2016-04-14Merge branch 'ss/commit-squash-msg' into maintLibravatar Junio C Hamano1-0/+28
2016-04-14Merge branch 'da/mergetool-delete-delete-conflict' into maintLibravatar Junio C Hamano1-0/+64
2016-04-14Merge branch 'jk/startup-info' into maintLibravatar Junio C Hamano2-5/+27
2016-04-14Merge branch 'jk/getwholeline-getdelim-empty' into maintLibravatar Junio C Hamano1-0/+4
2016-04-14Merge branch 'gf/fetch-pack-direct-object-fetch' into maintLibravatar Junio C Hamano1-0/+14
2016-04-14Merge branch 'jk/rev-parse-local-env-vars' into maintLibravatar Junio C Hamano1-0/+45
2016-04-14Merge branch 'jk/config-get-urlmatch' into maintLibravatar Junio C Hamano1-0/+3
2016-04-14Merge branch 'pb/t7502-drop-dup' into maintLibravatar Junio C Hamano1-5/+0
2016-04-14Merge branch 'jk/test-httpd-config-nosystem' into maintLibravatar Junio C Hamano1-0/+1
2016-04-14Merge branch 'sb/clone-t57-t56' into maintLibravatar Junio C Hamano10-0/+0
2016-04-14Merge branch 'jc/index-pack' into maintLibravatar Junio C Hamano1-0/+6
2016-04-14Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-initLibravatar Junio C Hamano155-837/+3270
2016-04-14Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-initLibravatar Junio C Hamano1-0/+41
2016-04-13Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Libravatar Junio C Hamano1-0/+14
2016-04-13Merge branch 'lt/pretty-expand-tabs'Libravatar Junio C Hamano2-1/+106
2016-04-13Merge branch 'mj/pull-rebase-autostash'Libravatar Junio C Hamano1-7/+67
2016-04-13Merge branch 'sk/send-pack-all-fix'Libravatar Junio C Hamano1-0/+12
2016-04-13Merge branch 'sg/diff-multiple-identical-renames'Libravatar Junio C Hamano1-0/+11
2016-04-13Merge branch 'ky/branch-d-worktree'Libravatar Junio C Hamano1-0/+6
2016-04-13Merge branch 'rz/worktree-no-checkout'Libravatar Junio C Hamano1-0/+12
2016-04-12merge-octopus: abort if index does not match HEADLibravatar Elijah Newren1-3/+3
2016-04-12t6044: new merge testcases for when index doesn't match HEADLibravatar Elijah Newren1-0/+153
2016-04-12builtin/merge.c: fix a bug with trivial mergesLibravatar Elijah Newren1-1/+1
2016-04-12t7605: add a testcase demonstrating a bug with trivial mergesLibravatar Elijah Newren1-1/+5
2016-04-12t3404: use write_scriptLibravatar Junio C Hamano1-4/+3
2016-04-11t1020: do not overuse printf and use write_scriptLibravatar Junio C Hamano1-5/+5
2016-04-10t5532: use write_scriptLibravatar Jeff King1-9/+12