summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/maint-commit-reflog-msg'Junio C Hamano2010-06-211-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder2010-06-131-2/+4
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ic/maint-rebase-i-abort'Junio C Hamano2010-06-211-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-111-0/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'eb/core-eol'Junio C Hamano2010-06-212-0/+238
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add "core.eol" config variableEyvind Bernhardsen2010-06-061-0/+83
| * | | | | | | | | | | | | | | | | | | | | | | | | | Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-191-4/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add per-repository eol normalizationEyvind Bernhardsen2010-05-191-6/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for per-repository eol normalizationEyvind Bernhardsen2010-05-191-0/+142
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fg/autocrlf'Junio C Hamano2010-06-211-0/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | autocrlf: Make it work also for un-normalized repositoriesFinn Arne Gangstad2010-05-111-0/+52
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/document-rebase-i-p-limitation'Junio C Hamano2010-06-211-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | rebase -i -p: document shortcomingsJonathan Nieder2010-06-111-0/+6
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tc/commit-abbrev-fix'Junio C Hamano2010-06-211-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | commit::print_summary(): don't use format_commit_message()Tay Ray Chuan2010-06-131-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | t7502-commit: add summary output tests for empty and merge commitsTay Ray Chuan2010-05-281-2/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | t7502-commit: add tests for summary outputTay Ray Chuan2010-05-281-0/+43
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gs/usage-to-stdout'Junio C Hamano2010-06-212-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | parseopt: wrap rev-parse --parseopt usage for eval consumptionThomas Rast2010-06-131-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | print the usage string on stdout instead of stderrGiuseppe Scrivano2010-05-312-6/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/async-thread'Junio C Hamano2010-06-211-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status