summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'da/pretty-tempname'Junio C Hamano2009-06-031-0/+9
|\
| * diff: generate pretty filenames in prep_temp_blob()David Aguilar2009-05-311-0/+9
* | Merge branch 'maint'Junio C Hamano2009-06-032-0/+21
|\ \
| * | blame: correctly handle a path that used to be a directoryJunio C Hamano2009-06-031-0/+15
| * | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-021-0/+6
| |\ \
| | * | Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-241-1/+1
| | * | t6023: merge-file fails to output anything for a degenerate mergeCharles Bailey2009-05-241-0/+6
| * | | Merge branch 'rs/maint-grep-word-regexp-fix' into maintJunio C Hamano2009-06-021-1/+8
| |\ \ \
| * \ \ \ Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maintJunio C Hamano2009-06-023-0/+84
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-add-p-coalesce-fix' into maintJunio C Hamano2009-06-021-0/+38
| |\ \ \ \ \
* | | | | | | test-lib: fix http exit codesClemens Buchacher2009-06-011-2/+4
* | | | | | | test-lib: allow exit trap to be used for cleanup by testsClemens Buchacher2009-06-011-7/+14
* | | | | | | test-lib: fail if invalid options are passedClemens Buchacher2009-06-011-1/+1
* | | | | | | Merge branch 'sb/opt-filename'Junio C Hamano2009-05-311-2/+17
|\ \ \ \ \ \ \
| * | | | | | | parse-opts: add OPT_FILENAME and transition builtinsStephen Boyd2009-05-251-2/+17
| * | | | | | | Merge branch 'jc/mktree' into sb/opt-filenameJunio C Hamano2009-05-251-0/+71
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sb/opt-filenameJunio C Hamano2009-05-25169-829/+3964
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch 'jc/mktree'Junio C Hamano2009-05-311-0/+71
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | mktree --missing: allow missing objectsJunio C Hamano2009-05-101-0/+10
| * | | | | | | t1010: add mktree testJunio C Hamano2009-05-101-0/+61
* | | | | | | | Merge branch 'ew/svn-test-and-old-i18n'Junio C Hamano2009-05-3113-82/+82
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ t9139 uses ancient, backwards-compatible iconv namesEric Wong2009-05-3013-82/+82
| |\ \ \ \ \ \ \ \
| | * | | | | | | | t8005: fix typo, it's ISO-8859-5, not KOI8-RBrandon Casey2009-05-271-1/+1
| | * | | | | | | | t8005: convert CP1251 character set to ISO8859-5Brandon Casey2009-05-223-15/+15
| | * | | | | | | | t8005: use more portable character encoding namesBrandon Casey2009-05-221-3/+3
| | * | | | | | | | t5100: use ancient encoding syntax for backwards compatibilityBrandon Casey2009-05-182-20/+20
| | * | | | | | | | t9301: use ISO8859-1 rather than ISO-8859-1Brandon Casey2009-05-181-1/+1
| | * | | | | | | | t3901: Use ISO8859-1 instead of ISO-8859-1 for backward compatibilityBrandon Casey2009-05-181-20/+20
| | * | | | | | | | t3901: avoid negation on right hand side of '|'Brandon Casey2009-05-181-1/+1
| | * | | | | | | | t3900: use ancient iconv names for backward compatibilityBrandon Casey2009-05-185-20/+20
* | | | | | | | | | Merge branch 'cc/bisect' (early part)Junio C Hamano2009-05-311-12/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | bisect: check ancestors without forking a "git rev-list" processChristian Couder2009-05-171-12/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | git-add: no need for -f when resolving a conflict in already tracked pathJeff King2009-05-311-0/+12
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-05-301-0/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-svn: refuse to dcommit non-UTF-8 messagesEric Wong2009-05-281-0/+47
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-293-0/+84
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-232-0/+74
| * | | | | | | | commit: -F overrides -tStephen Boyd2009-05-231-0/+10
* | | | | | | | | Merge branch 'jc/maint-add-p-coalesce-fix'Junio C Hamano2009-05-291-0/+38
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | t3701: ensure correctly set up repository after skipped testsJohannes Sixt2009-05-251-0/+6
| * | | | | | | | Revert "git-add--interactive: remove hunk coalescing"Junio C Hamano2009-05-161-1/+1
| * | | | | | | | Splitting a hunk that adds a line at the top fails in "add -p"Matt Graham2009-05-161-0/+32
* | | | | | | | | Merge branch 'rs/maint-grep-word-regexp-fix'Junio C Hamano2009-05-291-1/+8
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | grep: fix word-regexp at the beginning of linesRené Scharfe2009-05-231-1/+8
* | | | | | | | | t9120: don't expect failure with SVN_HTTPD_PORT unsetStephen Boyd2009-05-291-11/+6
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-05-281-0/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | fix segfault showing an empty remoteClemens Buchacher2009-05-271-0/+10
| * | | | | | | | Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maintJunio C Hamano2009-05-251-0/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano2009-05-251-0/+95
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | t5500: Modernize test styleStephen Boyd2009-05-271-127/+149
| |_|_|_|_|/ / / / |/| | | | | | | |
View Lorry Controller Status