summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* rerere: migrate to parse-options APIJonathan Nieder2010-08-061-0/+91
* t4200 (rerere): modernize styleJonathan Nieder2010-08-061-125/+180
* t6038 (merge.renormalize): check that it can be turned offJonathan Nieder2010-08-061-1/+49
* t6038 (merge.renormalize): try checkout -m and cherry-pickJonathan Nieder2010-08-061-0/+41
* t6038 (merge.renormalize): style nitpicksJonathan Nieder2010-08-061-8/+44
* Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen2010-07-021-1/+1
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+64
* Merge branch 'cp/textconv-cat-file'Junio C Hamano2010-06-271-0/+70
|\
| * t/t8007: test textconv support for cat-fileClément Poulain2010-06-181-0/+70
* | Merge branch 'tr/send-email-8bit'Junio C Hamano2010-06-271-0/+77
|\ \
| * | send-email: ask about and declare 8bit mailsThomas Rast2010-06-181-0/+77
* | | Merge branch 'js/maint-am-rebase-invalid-author'Junio C Hamano2010-06-271-2/+7
|\ \ \
| * | | am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-161-2/+7
| |/ /
* | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-271-0/+80
|\ \ \ | | |/ | |/|
| * | t/t8006: test textconv support for blameAxel Bonnet2010-06-181-0/+80
* | | Merge branch 'sb/format-patch-signature'Junio C Hamano2010-06-222-0/+55
|\ \ \
| * | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-162-0/+55
* | | | Merge branch 'mg/pretty-magic-space'Junio C Hamano2010-06-221-0/+10
|\ \ \ \
| * | | | pretty: Introduce ' ' modifier to add space if non-emptyMichael J Gruber2010-06-161-0/+10
| |/ / /
* | | | Merge branch 'cc/cherry-pick-series'Junio C Hamano2010-06-221-0/+95
|\ \ \ \
| * | | | revert: add tests to check cherry-picking many commitsChristian Couder2010-06-021-0/+95
| | |/ / | |/| |
* | | | Merge branch 'jc/rev-list-ancestry-path'Junio C Hamano2010-06-221-0/+73
|\ \ \ \
| * | | | revision: Turn off history simplification in --ancestry-path modeJohan Herland2010-06-061-0/+17
| * | | | revision: --ancestry-pathJunio C Hamano2010-04-211-0/+56
* | | | | Merge branch 'maint'Junio C Hamano2010-06-222-3/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2010-06-221-0/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-221-2/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-221-0/+68
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-221-0/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-222-0/+82
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano2010-06-221-7/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-221-8/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-221-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-221-0/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-221-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expressionJunio C Hamano2010-06-212-3/+3
| * | | | | | | | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maintJunio C Hamano2010-06-211-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/notes-doc' into maintJunio C Hamano2010-06-211-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/test-cleanup' into maintJunio C Hamano2010-06-215-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bg/apply-blank-trailing-context' into maintJunio C Hamano2010-06-211-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-stash-orphaned-file' into maintJunio C Hamano2010-06-161-0/+150
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mg/advice-statushints' into maintJunio C Hamano2010-06-161-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/maint-bundle' into maintJunio C Hamano2010-06-161-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/t7006-fixup' into maintJunio C Hamano2010-06-162-48/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/shortlog' into maintJunio C Hamano2010-06-162-24/+123
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-dumb-http-pack-reidx' into maintJunio C Hamano2010-06-161-3/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maintJunio C Hamano2010-06-161-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rc/maint-curl-helper' into maintJunio C Hamano2010-06-161-1/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hg/maint-attr-fix' into maintJunio C Hamano2010-06-161-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/status-optionally-refresh' into maintJunio C Hamano2010-06-161-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status