summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2011-02-161-0/+1
|\
| * fast-import: introduce "feature notes" commandJonathan Nieder2011-02-091-0/+1
* | t0003: add missing && at end of linesMatthieu Moy2010-08-291-5/+5
* | Sync with 1.7.0 seriesJunio C Hamano2010-07-271-1/+23
|\ \ | |/
| * config --get --path: check for unset $HOMEJonathan Nieder2010-07-271-1/+23
| * Merge branch 'maint-1.6.6' into maint-1.7.0Junio C Hamano2010-07-251-0/+18
| |\
| | * Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-07-251-0/+18
| | |\
| | | * Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-07-251-0/+18
| | | |\
* | | | | t/README: clarify test_must_fail descriptionBrandon Casey2010-07-201-0/+8
* | | | | t0005: work around strange $? in ksh when program terminated by a signalJohannes Sixt2010-07-091-0/+1
* | | | | Merge branch 'maint-1.6.4' into maintJunio C Hamano2010-07-071-0/+18
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-optionUwe Kleine-König2010-07-071-0/+18
* | | | | Merge branch 'tr/receive-pack-aliased-update-fix' into maintJunio C Hamano2010-07-071-0/+49
|\ \ \ \ \
| * | | | | receive-pack: detect aliased updates which can occur with symrefsJay Soffian2010-04-191-0/+49
* | | | | | add missing && to submodule-merge testcaseHeiko Voigt2010-07-061-1/+1
* | | | | | t0006: test timezone parsingJeff King2010-07-051-2/+3
* | | | | | t/t9001: use egrep when regular expressions are involvedBrandon Casey2010-06-291-3/+3
* | | | | | Merge branch 'tr/send-email-8bit' into maintJunio C Hamano2010-06-281-0/+77
|\ \ \ \ \ \
| * | | | | | send-email: ask about and declare 8bit mailsThomas Rast2010-06-181-0/+77
* | | | | | | Merge branch 'js/maint-am-rebase-invalid-author' into maintJunio C Hamano2010-06-281-2/+7
|\ \ \ \ \ \ \
| * | | | | | | am: use get_author_ident_from_commit instead of mailinfo when rebasingJay Soffian2010-06-161-2/+7
| |/ / / / / /
* | | | | | | notes: check number of parameters to "git notes copy"Jeff King2010-06-281-0/+6
* | | | | | | Merge branch 'ic/maint-rebase-i-abort' into maintJunio C Hamano2010-06-221-0/+10
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: Abort cleanly if new base cannot be checked outIan Ward Comfort2010-06-111-0/+10
* | | | | | | | Merge branch 'cc/maint-commit-reflog-msg' into maintJunio C Hamano2010-06-221-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: use value of GIT_REFLOG_ACTION env variable as reflog messageChristian Couder2010-06-131-2/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'tc/commit-abbrev-fix' into maintJunio C Hamano2010-06-221-0/+68
|\ \ \ \ \ \ \ \
| * | | | | | | | commit::print_summary(): don't use format_commit_message()Tay Ray Chuan2010-06-131-2/+2
| * | | | | | | | t7502-commit: add summary output tests for empty and merge commitsTay Ray Chuan2010-05-281-2/+27
| * | | | | | | | t7502-commit: add tests for summary outputTay Ray Chuan2010-05-281-0/+43
* | | | | | | | | Merge branch 'jn/document-rebase-i-p-limitation' into maintJunio C Hamano2010-06-221-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase -i -p: document shortcomingsJonathan Nieder2010-06-111-0/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-222-0/+82
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-062-0/+82
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/t9129-any-utf8' into maintJunio C Hamano2010-06-221-7/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t9129: fix UTF-8 locale detectionJunio C Hamano2010-06-021-7/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'cb/ls-files-cdup' into maintJunio C Hamano2010-06-221-8/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ls-files: allow relative pathspecClemens Buchacher2010-06-051-8/+4
* | | | | | | | | | Merge branch 'tc/merge-m-log' into maintJunio C Hamano2010-06-221-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 'jn/maint-amend-missing-name' into maintJunio C Hamano2010-06-221-0/+46
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit --amend: cope with missing display nameJonathan Nieder2010-05-041-0/+46
* | | | | | | | | | | | Merge branch 'pc/remove-warn' into maintJunio C Hamano2010-06-221-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Introduce remove_or_warn functionPeter Collingbourne2010-03-281-0/+38
* | | | | | | | | | | | | tests: remove unnecessary '^' from 'expr' regular expressionJunio C Hamano2010-06-212-3/+3
* | | | | | | | | | | | | Merge branch 'cb/assume-unchanged-fix' into maintJunio C Hamano2010-06-211-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | do not overwrite files marked "assume unchanged"Clemens Buchacher2010-05-011-0/+24
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jn/notes-doc' into maintJunio C Hamano2010-06-211-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \