summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sd/log-decorate'Junio C Hamano2010-05-081-0/+49
|\
| * log.decorate: only ignore it under "log --pretty=raw"Junio C Hamano2010-04-081-28/+16
| * log --pretty/--oneline: ignore log.decorateJunio C Hamano2010-04-061-16/+28
| * log.decorate: usability fixesJunio C Hamano2010-02-171-0/+49
* | Merge branch 'mh/status-optionally-refresh'Junio C Hamano2010-05-081-0/+25
|\ \
| * | t7508: add a test for "git status" in a read-only repositoryMarkus Heidelberg2010-04-031-0/+15
| * | git status: refresh the index if possibleMarkus Heidelberg2010-04-021-1/+1
| * | t7508: add test for "git status" refreshing the indexMarkus Heidelberg2010-04-021-0/+10
* | | Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-082-24/+71
|\ \ \
| * | | whitespace: tests for git-apply --whitespace=fix with tab-in-indentChris Webb2010-04-041-24/+29
| * | | whitespace: tests for git-diff --check with tab-in-indent error classChris Webb2010-04-041-0/+42
| |/ /
* | | Merge branch 'jk/cached-textconv'Junio C Hamano2010-05-081-0/+109
|\ \ \
| * | | diff: cache textconv outputJeff King2010-04-021-0/+109
| |/ /
* | | Merge branch 'pc/remove-warn'Junio C Hamano2010-05-081-0/+38
|\ \ \
| * | | Introduce remove_or_warn functionPeter Collingbourne2010-03-281-0/+38
* | | | test-lib: some shells do not let $? propagate into an evalJonathan Nieder2010-05-062-3/+25
* | | | test-lib: Let tests specify commands to be run at end of testJonathan Nieder2010-05-041-1/+27
* | | | clone: quell the progress report from init and report on cloneJunio C Hamano2010-05-041-1/+1
* | | | test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+.Michal Sojka2010-05-041-0/+12
* | | | Merge branch 'maint'Junio C Hamano2010-04-191-6/+6
|\ \ \ \
| * | | | t7012: Mark missing tests as TODOMichael J Gruber2010-04-191-6/+6
* | | | | Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'Junio C Hamano2010-04-181-0/+18
|\ \ \ \ \
| * | | | | t3301: add tests to use --format="%N"Junio C Hamano2010-04-181-0/+18
* | | | | | Merge branch 'maint'Junio C Hamano2010-04-172-6/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | t1010-mktree: Adjust expected result to code and documentationMichael J Gruber2010-04-171-6/+4
| * | | | | combined diff: correctly handle truncated fileThomas Rast2010-04-171-0/+8
| * | | | | Merge branch 'ef/maint-empty-commit-log' into maintJunio C Hamano2010-04-091-0/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano2010-04-091-1/+22
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-refs-dangling' into maintJunio C Hamano2010-03-311-3/+3
| |\ \ \ \ \ \ \
* | | | | | | | | t6006: do not write to /tmpMatthew Ogilvie2010-04-171-1/+1
* | | | | | | | | t3507: Make test executableStephen Boyd2010-04-111-0/+0
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'jl/maint-submodule-gitfile-awareness'Junio C Hamano2010-04-102-0/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Teach diff --submodule and status to handle .git files in submodulesJens Lehmann2010-04-102-0/+31
* | | | | | | | | Merge branch 'mg/notes-reflog'Junio C Hamano2010-04-071-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs.c: Write reflogs for notes just like for branch headsMichael J Gruber2010-03-291-1/+1
| * | | | | | | | | t3301-notes: Test the creation of reflog entriesMichael J Gruber2010-03-291-0/+9
* | | | | | | | | | Merge branch 'sb/fmt-merge-msg'Junio C Hamano2010-04-061-34/+162
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t6200: test fmt-merge-msg moreStephen Boyd2010-03-241-0/+115
| * | | | | | | | | | t6200: modernize with test_tickStephen Boyd2010-03-241-35/+29
| * | | | | | | | | | fmt-merge-msg: be quiet if nothing to mergeStephen Boyd2010-03-241-0/+19
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-04-061-1/+22
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-241-1/+22
* | | | | | | | | | Merge branch 'ef/maint-empty-commit-log'Junio C Hamano2010-04-061-0/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | rev-list: fix --pretty=oneline with empty messageErik Faye-Lund2010-03-211-0/+9
* | | | | | | | | | Merge branch 'mb/rebase-i-no-ff'Junio C Hamano2010-04-031-4/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach rebase the --no-ff option.Marc Branchaud2010-03-241-4/+32
* | | | | | | | | | | Merge branch 'jn/merge-diff3-label'Junio C Hamano2010-04-033-8/+263
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-201-2/+2
| * | | | | | | | | | | revert: clarify label on conflict hunksJonathan Nieder2010-03-201-2/+2
| * | | | | | | | | | | checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-201-1/+1
View Lorry Controller Status