summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2014-11-12Merge branch 'jk/fetch-reflog-df-conflict'Libravatar Junio C Hamano1-18/+18
2014-11-12notes: empty notes should be shown by 'git log'Libravatar Johan Herland1-0/+12
2014-11-12builtin/notes: add --allow-empty, to allow storing empty notesLibravatar Johan Herland1-1/+9
2014-11-10t3301: verify that 'git notes' removes empty notes by defaultLibravatar Johan Herland1-0/+27
2014-11-10trailer: add test with an old style conflict blockLibravatar Christian Couder1-1/+31
2014-11-10trailer: reuse ignore_non_trailer() to ignore conflict linesLibravatar Christian Couder1-0/+2
2014-11-10Merge branch 'jc/conflict-hint' into cc/interpret-trailers-moreLibravatar Junio C Hamano1-8/+34
2014-11-10t1410: fix breakage on case-insensitive filesystemsLibravatar Jeff King1-18/+18
2014-11-06Merge branch 'tm/line-log-first-parent'Libravatar Junio C Hamano1-0/+5
2014-11-06Merge branch 'jk/fetch-reflog-df-conflict'Libravatar Junio C Hamano2-0/+74
2014-11-04line-log: fix crash when --first-parent is usedLibravatar Tzvetan Mikov1-0/+5
2014-11-04ignore stale directories when checking reflog existenceLibravatar Jeff King1-0/+34
2014-11-04fetch: load all default config at startupLibravatar Jeff King1-0/+40
2014-11-03lockfile.c: store absolute pathLibravatar Nguyễn Thái Ngọc Duy1-0/+15
2014-10-31Merge branch 'rs/grep-color-words'Libravatar Junio C Hamano1-0/+94
2014-10-29Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maintLibravatar Junio C Hamano1-0/+9
2014-10-29Merge branch 'da/difftool'Libravatar Junio C Hamano1-0/+51
2014-10-29Merge branch 'mg/lib-gpg-ro-safety'Libravatar Junio C Hamano1-0/+1
2014-10-29Merge branch 'jk/prune-mtime'Libravatar Junio C Hamano4-0/+181
2014-10-28merge & sequencer: turn "Conflicts:" hint into a commentLibravatar Junio C Hamano1-8/+34
2014-10-28difftool: add support for --trust-exit-codeLibravatar David Aguilar1-0/+43
2014-10-28grep: add color.grep.matchcontext and color.grep.matchselectedLibravatar René Scharfe1-0/+94
2014-10-27strbuf_add_commented_lines(): avoid SP-HT sequence in commented linesLibravatar Junio C Hamano1-0/+6
2014-10-27t/lib-gpg: make gpghome files writableLibravatar Michael J Gruber1-0/+1
2014-10-27difftool--helper: exit when reading a prompt answer failsLibravatar Johannes Sixt1-0/+8
2014-10-24Merge branch 'jc/push-cert'Libravatar Junio C Hamano1-0/+44
2014-10-24Merge branch 'wk/t1304-wo-USER'Libravatar Junio C Hamano1-1/+1
2014-10-24Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Libravatar Junio C Hamano1-0/+9
2014-10-24push: heed user.signingkey for signed pushesLibravatar Michael J Gruber1-0/+44
2014-10-23diff -B -M: fix output for "copy and then rewrite" caseLibravatar Junio C Hamano2-3/+4
2014-10-21Merge branch 'da/mergetool-temporary-directory'Libravatar Junio C Hamano1-0/+23
2014-10-21Merge branch 'da/mergetool-tool-help'Libravatar Junio C Hamano1-6/+6
2014-10-21Merge branch 'da/mergetool-tests'Libravatar Junio C Hamano2-471/+469
2014-10-21Merge branch 'rs/ref-transaction'Libravatar Junio C Hamano6-71/+322
2014-10-20Merge branch 'cc/interpret-trailers'Libravatar Junio C Hamano1-0/+863
2014-10-20Merge branch 'ta/config-set'Libravatar Junio C Hamano1-2/+2
2014-10-20Merge branch 'jk/test-shell-trace'Libravatar Junio C Hamano4-35/+84
2014-10-20Revert "archive: honor tar.umask even for pax headers"Libravatar Junio C Hamano1-5/+0
2014-10-19t1304: Set LOGNAME even if USER is unset or nullLibravatar W. Trevor King1-1/+1
2014-10-19pack-objects: turn off bitmaps when we split packsLibravatar Jeff King1-0/+9
2014-10-19repack: pack objects mentioned by the indexLibravatar Jeff King1-0/+13
2014-10-19rev-list: add --indexed-objects optionLibravatar Jeff King1-0/+23
2014-10-19t5516: test pushing a tag of an otherwise unreferenced blobLibravatar Jeff King1-0/+13
2014-10-16t7610-mergetool: add test cases for mergetool.writeToTempLibravatar David Aguilar1-0/+23
2014-10-16test-lib-functions: adjust style to match CodingGuidelinesLibravatar David Aguilar1-12/+18
2014-10-16t7610-mergetool: use test_config to isolate testsLibravatar David Aguilar1-5/+3
2014-10-16write_sha1_file: freshen existing objectsLibravatar Jeff King1-0/+27
2014-10-16pack-objects: match prune logic for discarding objectsLibravatar Jeff King1-38/+55
2014-10-16prune: keep objects reachable from recent objectsLibravatar Jeff King1-0/+88
2014-10-15clone: --dissociate option to mark that reference is only temporaryLibravatar Junio C Hamano1-0/+17