summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2010-08-06t6038 (merge.renormalize): check that it can be turned offLibravatar Jonathan Nieder1-1/+49
2010-08-06t6038 (merge.renormalize): try checkout -m and cherry-pickLibravatar Jonathan Nieder1-0/+41
2010-08-06t6038 (merge.renormalize): style nitpicksLibravatar Jonathan Nieder1-8/+44
2010-07-02Try normalizing files to avoid delete/modify conflicts when mergingLibravatar Eyvind Bernhardsen1-1/+1
2010-07-02Avoid conflicts when merging branches with mixed normalizationLibravatar Eyvind Bernhardsen1-0/+64
2010-06-27Merge branch 'cp/textconv-cat-file'Libravatar Junio C Hamano1-0/+70
2010-06-27Merge branch 'tr/send-email-8bit'Libravatar Junio C Hamano1-0/+77
2010-06-27Merge branch 'js/maint-am-rebase-invalid-author'Libravatar Junio C Hamano1-2/+7
2010-06-27Merge branch 'ab/blame-textconv'Libravatar Junio C Hamano1-0/+80
2010-06-22Merge branch 'sb/format-patch-signature'Libravatar Junio C Hamano2-0/+55
2010-06-22Merge branch 'mg/pretty-magic-space'Libravatar Junio C Hamano1-0/+10
2010-06-22Merge branch 'cc/cherry-pick-series'Libravatar Junio C Hamano1-0/+95
2010-06-22Merge branch 'jc/rev-list-ancestry-path'Libravatar Junio C Hamano1-0/+73
2010-06-22Merge branch 'maint'Libravatar Junio C Hamano2-3/+3
2010-06-22Merge branch 'ic/maint-rebase-i-abort' into maintLibravatar Junio C Hamano1-0/+10
2010-06-22Merge branch 'cc/maint-commit-reflog-msg' into maintLibravatar Junio C Hamano1-2/+4
2010-06-22Merge branch 'tc/commit-abbrev-fix' into maintLibravatar Junio C Hamano1-0/+68
2010-06-22Merge branch 'jn/document-rebase-i-p-limitation' into maintLibravatar Junio C Hamano1-0/+6
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintLibravatar Junio C Hamano2-0/+82
2010-06-22Merge branch 'jc/t9129-any-utf8' into maintLibravatar Junio C Hamano1-7/+13
2010-06-22Merge branch 'cb/ls-files-cdup' into maintLibravatar Junio C Hamano1-8/+4
2010-06-22Merge branch 'tc/merge-m-log' into maintLibravatar Junio C Hamano1-4/+20
2010-06-22Merge branch 'jn/maint-amend-missing-name' into maintLibravatar Junio C Hamano1-0/+46
2010-06-22Merge branch 'pc/remove-warn' into maintLibravatar Junio C Hamano1-0/+38
2010-06-21tests: remove unnecessary '^' from 'expr' regular expressionLibravatar Junio C Hamano2-3/+3
2010-06-21Merge branch 'cc/maint-commit-reflog-msg'Libravatar Junio C Hamano1-2/+4
2010-06-21Merge branch 'ic/maint-rebase-i-abort'Libravatar Junio C Hamano1-0/+10
2010-06-21Merge branch 'eb/core-eol'Libravatar Junio C Hamano2-0/+238
2010-06-21Merge branch 'fg/autocrlf'Libravatar Junio C Hamano1-0/+52
2010-06-21Merge branch 'jn/document-rebase-i-p-limitation'Libravatar Junio C Hamano1-0/+6
2010-06-21Merge branch 'tc/commit-abbrev-fix'Libravatar Junio C Hamano1-0/+68
2010-06-21Merge branch 'gs/usage-to-stdout'Libravatar Junio C Hamano2-6/+10
2010-06-21Merge branch 'js/async-thread'Libravatar Junio C Hamano1-9/+9
2010-06-21Merge branch 'gv/portable'Libravatar Junio C Hamano20-56/+66
2010-06-21Merge branch 'bc/portable'Libravatar Junio C Hamano5-11/+19
2010-06-21Merge branch 'em/checkout-orphan'Libravatar Junio C Hamano2-21/+81
2010-06-21Merge branch 'cb/assume-unchanged-fix' into maintLibravatar Junio C Hamano1-0/+24
2010-06-21Merge branch 'jn/notes-doc' into maintLibravatar Junio C Hamano1-0/+38
2010-06-21Merge branch 'ab/test-cleanup' into maintLibravatar Junio C Hamano5-5/+7
2010-06-21Merge branch 'bg/apply-blank-trailing-context' into maintLibravatar Junio C Hamano1-0/+12
2010-06-18t/t8007: test textconv support for cat-fileLibravatar Clément Poulain1-0/+70
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Libravatar Junio C Hamano2-0/+82
2010-06-18Merge branch 'cb/ls-files-cdup'Libravatar Junio C Hamano1-8/+4
2010-06-18Merge branch 'jc/t9129-any-utf8'Libravatar Junio C Hamano1-7/+13
2010-06-18Merge branch 'jn/rebase-cmdline-fix'Libravatar Junio C Hamano1-1/+12
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Libravatar Junio C Hamano1-0/+35
2010-06-18Merge branch 'mg/status-b'Libravatar Junio C Hamano1-1/+46
2010-06-18Merge branch 'jn/gitweb-plackup'Libravatar Junio C Hamano1-3/+3
2010-06-18Merge branch 'jk/url-decode'Libravatar Junio C Hamano1-0/+12
2010-06-18Merge branch 'jn/remote-set-branches'Libravatar Junio C Hamano1-0/+88