summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streamingJunio C Hamano2011-05-152-2/+43
|\ \ \
| | | * t6050: make sure we test not just commit replacementJunio C Hamano2011-05-151-2/+16
| | |/ | |/|
| | * Bigfile: teach "git add" to send a large file straight to a packJunio C Hamano2011-05-131-0/+27
* | | Merge branch 'bf/commit-template-no-cleanup'Junio C Hamano2011-05-132-0/+22
|\ \ \
| * | | Do not strip empty lines / trailing spaces from a commit message templateBoris Faure2011-05-112-0/+22
* | | | Merge branch 'jc/t1506-shell-param-expansion-gotcha'Junio C Hamano2011-05-131-2/+5
|\ \ \ \
| * | | | t1507: avoid "${parameter<op>'word'}" inside double-quotesJunio C Hamano2011-05-091-2/+5
* | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-131-0/+979
|\ \ \ \ \
| * | | | | Mark dirstat error messages for translationJohan Herland2011-04-291-11/+11
| * | | | | Improve error handling when parsing dirstat parametersJohan Herland2011-04-291-0/+37
| * | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-291-0/+100
| * | | | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-291-0/+64
| * | | | | Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-291-0/+72
| * | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland2011-04-291-1/+122
| * | | | | Make --dirstat=0 output directories that contribute < 0.1% of changesJohan Herland2011-04-291-2/+2
| * | | | | Add several testcases for --dirstat and friendsJohan Herland2011-04-291-0/+585
* | | | | | Merge branch 'jc/fix-add-u-unmerged'Junio C Hamano2011-05-131-17/+7
|\ \ \ \ \ \
| * | | | | | Fix "add -u" that sometimes fails to resolve unmerged pathsJunio C Hamano2011-04-231-17/+7
* | | | | | | Merge branch 'jn/setup-revisions-glob-and-friends-passthru'Junio C Hamano2011-05-131-0/+50
|\ \ \ \ \ \ \
| * | | | | | | revisions: allow --glob and friends in parse_options-enabled commandsJonathan Nieder2011-04-211-0/+50
* | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-131-2/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'aw/maint-rebase-i-p-no-ff' into maintJunio C Hamano2011-05-131-1/+31
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/blame-parsename' into maintJunio C Hamano2011-05-132-2/+13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-one-file-working-tree' into maintJunio C Hamano2011-05-131-0/+100
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-1313-22/+102
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'mz/maint-rename-unmerged' into maintJunio C Hamano2011-05-131-0/+62
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5400: Fix a couple of typosJohan Herland2011-05-131-2/+2
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-121-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Tweak t3102-ls-tree-wildcards to run on WindowsJohannes Sixt2011-05-121-7/+7
* | | | | | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions'Junio C Hamano2011-05-111-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge: make branch.<name>.mergeoptions correctly override merge.<option>Junio C Hamano2011-05-061-0/+32
* | | | | | | | | | | | | | Merge branch 'jn/maint-test-merge-verify-parents'Junio C Hamano2011-05-112-99/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tests: teach verify_parents to check for extra parentsJonathan Nieder2011-05-061-0/+1
| * | | | | | | | | | | | | | tests: eliminate unnecessary setup test assertionsJonathan Nieder2011-05-062-99/+97
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks'Junio C Hamano2011-05-111-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t3701: add-p-fix makes the last test to passJunio C Hamano2011-05-081-1/+1
| * | | | | | | | | | | | | | t3701: Editing a split hunk in an "add -p" sessionJunio C Hamano2011-04-291-0/+36
* | | | | | | | | | | | | | | Merge branch 'dm/http-cleanup'Junio C Hamano2011-05-111-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t5541-http-push: add test for chunkedTay Ray Chuan2011-05-041-2/+16
* | | | | | | | | | | | | | | | Merge branch 'jn/ctags'Junio C Hamano2011-05-112-0/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | gitweb: Restructure projects list generationJakub Narebski2011-04-292-0/+123
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jn/run-command-error-failure'Junio C Hamano2011-05-061-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | tests: check error message from run_commandJonathan Nieder2011-04-201-0/+23
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/merge-one-file-working-tree'Junio C Hamano2011-05-061-0/+100
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | merge-one-file: fix broken merges with alternate work treesJeff King2011-04-291-2/+2
| * | | | | | | | | | | | | | add tests for merge-index / merge-one-fileJeff King2011-04-291-0/+100
* | | | | | | | | | | | | | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-0613-22/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | diff-files: show unmerged entries correctlyJunio C Hamano2011-04-231-0/+87
| * | | | | | | | | | | | | | test: use $_z40 from test-libJunio C Hamano2011-04-2312-22/+15
* | | | | | | | | | | | | | | Merge branch 'js/blame-parsename'Junio C Hamano2011-05-062-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |