summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* branch/checkout --track: Ensure that upstream branch is indeed a branchJohan Herland2011-02-163-15/+31
* Merge branch 'jk/maint-decorate-01-bool' into maintJunio C Hamano2010-12-101-0/+9
|\
| * log.decorate: accept 0/1 bool valuesJeff King2010-11-171-0/+9
* | Merge branch 'mg/maint-tag-rfc1991' into maintJunio C Hamano2010-12-101-0/+66
|\ \
| * | tag: recognize rfc1991 signaturesMichael J Gruber2010-11-101-6/+6
| * | t/t7004-tag: test handling of rfc1991 signaturesMichael J Gruber2010-11-101-0/+66
* | | Merge branch 'jn/cherry-pick-refresh-index' into maintJunio C Hamano2010-12-091-0/+10
|\ \ \
| * | | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-101-0/+10
| |/ /
* | | Merge branch 'fc/apply-p2-get-header-name' into maintJunio C Hamano2010-12-091-0/+26
|\ \ \
| * | | test: git-apply -p2 rename/chmod onlyJunio C Hamano2010-11-051-0/+26
| |/ /
* | | Merge branch 'ak/apply-non-git-epoch' into maintJunio C Hamano2010-12-094-0/+28
|\ \ \
| * | | apply: handle patches with funny filename and colon in timezoneJonathan Nieder2010-11-103-0/+26
| * | | apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg2010-10-131-0/+2
* | | | Merge branch 'cm/diff-check-at-eol' into maintJunio C Hamano2010-12-091-0/+9
|\ \ \ \
| * | | | diff --check: correct line numbers of new blank lines at EOFChristoph Mallon2010-10-161-0/+9
* | | | | Merge branch 'tc/smart-http-post-redirect' into maintJunio C Hamano2010-12-092-0/+15
|\ \ \ \ \
| * | | | | smart-http: Don't change POST to GET when following redirectTay Ray Chuan2010-09-272-0/+15
* | | | | | Merge branch 'ab/require-perl-5.8' into maintJunio C Hamano2010-12-092-1/+2
|\ \ \ \ \ \
| * | | | | | perl: bump the required Perl version to 5.8 from 5.6.[21]Ævar Arnfjörð Bjarmason2010-09-272-1/+2
| |/ / / / /
* | | | | | Merge branch 'cb/maint-orphan-merge-noclobber' into maintJunio C Hamano2010-12-021-0/+16
|\ \ \ \ \ \
| * | | | | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-151-0/+16
* | | | | | | Merge branch 'bg/maint-gitweb-test-lib' into maintJunio C Hamano2010-12-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t/gitweb-lib: Don't pass constant to decode_utf8Brian Gernhardt2010-10-201-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'tr/maint-merge-file-subdir' into maintJunio C Hamano2010-12-021-0/+8
|\ \ \ \ \ \ \
| * | | | | | | merge-file: correctly find files when called in subdirThomas Rast2010-10-181-0/+8
* | | | | | | | Merge branch 'ks/no-textconv-symlink' into maintJunio C Hamano2010-12-022-12/+88
|\ \ \ \ \ \ \ \
| * | | | | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-292-8/+4
| * | | | | | | | blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinksKirill Smelkov2010-09-292-0/+78
| * | | | | | | | blame,cat-file: Prepare --textconv tests for correctly-failing conversion pro...Kirill Smelkov2010-09-292-12/+14
* | | | | | | | | Merge branch 'bc/fortran-userdiff' into maintJunio C Hamano2010-12-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | userdiff.c: add builtin fortran regex patternsBrandon Casey2010-09-101-1/+1
* | | | | | | | | | Merge branch 'kb/maint-diff-ws-check' into maintJunio C Hamano2010-11-243-44/+114
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: handle lines containing only whitespace and tabs betterKevin Ballard2010-10-201-0/+37
| * | | | | | | | | | test-lib: extend test_decode_color to handle more color codesKevin Ballard2010-10-202-44/+77
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jm/mailmap' into maintJunio C Hamano2010-11-241-12/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t4203: do not let "git shortlog" DWIM based on ttyJunio C Hamano2010-10-191-2/+2
| * | | | | | | | | | t4203 (mailmap): stop hardcoding commit ids and datesJonathan Nieder2010-10-181-9/+17
| * | | | | | | | | | mailmap: fix use of freed memoryJim Meyering2010-10-131-3/+38
* | | | | | | | | | | Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-241-1/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply: don't segfault on binary files with missing dataJeff King2010-10-291-1/+26
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ak/submodule-sync' into maintJunio C Hamano2010-11-241-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule sync: Update "submodule.<name>.url" for empty directoriesAndreas Köhler2010-10-131-1/+11
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-243-4/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-133-4/+12
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano2010-11-241-0/+109
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add rebase patch id testsClemens Buchacher2010-09-231-0/+109
* | | | | | | | | | | | Merge branch 'jk/no-textconv-symlink' into maintJunio C Hamano2010-11-241-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | diff: don't use pathname-based diff drivers for symlinksJeff King2010-09-231-0/+26
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bc/fix-cherry-pick-root' into maintJunio C Hamano2010-11-241-0/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | builtin/revert.c: don't dereference a NULL pointerBrandon Casey2010-09-271-0/+10
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |