summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gv/portable'Junio C Hamano2010-06-2120-56/+66
|\
| * test-lib: use DIFF definition from GIT-BUILD-OPTIONSJunio C Hamano2010-06-111-10/+10
| * test_cmp: do not use "diff -u" on platforms that lack oneGary V. Vaughan2010-05-311-0/+1
| * fixup: do not unconditionally disable "diff -u"Junio C Hamano2010-05-312-5/+10
| * tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan2010-05-3119-55/+59
* | Merge branch 'bc/portable'Junio C Hamano2010-06-215-11/+19
|\ \
| * | Remove python 2.5'ismsBrandon Casey2010-06-131-2/+2
| * | t/aggregate-results: accomodate systems with small max argument list lengthBrandon Casey2010-06-022-2/+4
| * | t/t7006: ignore return status of shell's unset builtinBrandon Casey2010-06-021-5/+5
| * | t/t5150: remove space from sed scriptBrandon Casey2010-06-021-2/+2
| * | t/t5800: skip if python version is older than 2.5Brandon Casey2010-06-021-2/+8
* | | Merge branch 'em/checkout-orphan'Junio C Hamano2010-06-212-21/+81
|\ \ \
| * | | t3200: test -l with core.logAllRefUpdates optionsErick Mattos2010-06-031-0/+24
| * | | checkout --orphan: respect -l option alwaysErick Mattos2010-06-031-21/+57
* | | | Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano2010-06-182-0/+82
|\ \ \ \
| * | | | diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-062-0/+82
* | | | | Merge branch 'cb/ls-files-cdup'Junio C Hamano2010-06-181-8/+4
|\ \ \ \ \
| * | | | | ls-files: allow relative pathspecClemens Buchacher2010-06-051-8/+4
* | | | | | Merge branch 'jc/t9129-any-utf8'Junio C Hamano2010-06-181-7/+13
|\ \ \ \ \ \
| * | | | | | t9129: fix UTF-8 locale detectionJunio C Hamano2010-06-021-7/+13
* | | | | | | Merge branch 'jn/rebase-cmdline-fix'Junio C Hamano2010-06-181-1/+12
|\ \ \ \ \ \ \
| * | | | | | | rebase: improve error message when upstream argument is missingJonathan Nieder2010-05-311-1/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano2010-06-181-0/+35
|\ \ \ \ \ \ \
| * | | | | | | diff.c: Ensure "index $from..$to" line contains unambiguous SHA1sJohan Herland2010-05-311-0/+35
| |/ / / / / /
* | | | | | | Merge branch 'mg/status-b'Junio C Hamano2010-06-181-1/+46
|\ \ \ \ \ \ \
| * | | | | | | Documentation+t5708: document and test status -s -bMichael J Gruber2010-06-031-1/+46
* | | | | | | | Merge branch 'jn/gitweb-plackup'Junio C Hamano2010-06-181-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: Move static files into seperate subdirectoryPavan Kumar Sunkara2010-05-311-3/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/url-decode'Junio C Hamano2010-06-181-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | decode file:// and ssh:// URLsJeff King2010-05-241-0/+12
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jn/remote-set-branches'Junio C Hamano2010-06-181-0/+88
|\ \ \ \ \ \ \ \
| * | | | | | | | Add git remote set-branchesJonathan Nieder2010-05-191-0/+88
* | | | | | | | | Merge branch 'rc/ls-remote-default'Junio C Hamano2010-06-181-4/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-remote: print URL when no repo is specifiedTay Ray Chuan2010-05-111-4/+20
* | | | | | | | | | Merge branch 'hg/id-munging'Junio C Hamano2010-06-181-6/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | convert: Keep foreign $Id$ on checkout.Henrik Grubbström2010-04-101-1/+1
| * | | | | | | | | | convert: Safer handling of $Id$ contraction.Henrik Grubbström2010-04-101-6/+10
* | | | | | | | | | | Merge branch 'tc/merge-m-log'Junio C Hamano2010-06-181-4/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge: --log appends shortlog to message if specifiedTay Ray Chuan2010-05-101-1/+1
| * | | | | | | | | | | t7604-merge-custom-message: show that --log doesn't append to -mTay Ray Chuan2010-05-101-0/+12
| * | | | | | | | | | | t7604-merge-custom-message: shift expected output creationTay Ray Chuan2010-05-101-4/+8
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ab/cvsserver'Junio C Hamano2010-06-131-1/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-cvsserver: test for pserver authentication supportÆvar Arnfjörð Bjarmason2010-05-191-1/+15
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mg/notes-dry-run'Junio C Hamano2010-06-131-2/+46
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | notes: dry-run and verbose options for pruneMichael J Gruber2010-05-191-2/+46
* | | | | | | | | | | | Merge branch 'jn/fsck-ident'Junio C Hamano2010-06-131-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fsck: fix bogus commit header checkJonathan Nieder2010-05-281-0/+8
* | | | | | | | | | | | | Merge branch 'ab/submodule-foreach-toplevel'Junio C Hamano2010-06-131-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-submodule foreach: Add $toplevel variableÆvar Arnfjörð Bjarmason2010-05-251-3/+7
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rs/grep-binary'Junio C Hamano2010-06-131-0/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \