summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-203-0/+305
|\
| * t3417: Add test cases for "rebase --whitespace=fix"Björn Gustavsson2010-03-061-0/+126
| * t4124: Add additional tests of --whitespace=fixBjörn Gustavsson2010-03-061-0/+170
| * apply: Remove the quick rejection testBjörn Gustavsson2010-03-061-0/+9
* | Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-201-0/+37
|\ \
| * | merge-file: add option to specify the marker sizeBert Wesarg2010-03-021-0/+37
| |/
* | Use test_expect_success for test setupsBrian Gernhardt2010-03-205-61/+70
* | Merge branch 'sd/format-patch-to'Junio C Hamano2010-03-152-0/+118
|\ \
| * | send-email: add --no-cc, --no-to, and --no-bccStephen Boyd2010-03-081-0/+66
| * | format-patch: add --no-cc, --no-to, and --no-add-headersStephen Boyd2010-03-081-0/+38
| * | Add 'git format-patch --to=' option and 'format.to' configuration variable.Steven Drake2010-03-061-0/+14
| |/
* | Merge branch 'tc/http-cleanup'Junio C Hamano2010-03-153-20/+34
|\ \
| * | t554[01]-http-push: refactor, add non-ff testsTay Ray Chuan2010-03-023-22/+34
| * | t5541-http-push: check that ref is unchanged for non-ff testTay Ray Chuan2010-03-021-2/+4
| |/
* | Merge branch 'ld/push-porcelain'Junio C Hamano2010-03-151-0/+50
|\ \
| * | t5516: Use test_cmp when appropriateJunio C Hamano2010-03-111-3/+3
| * | git-push: add tests for git push --porcelainLarry D'Anna2010-02-281-0/+50
* | | Merge branch 'jh/notes'Junio C Hamano2010-03-155-48/+715
|\ \ \
| * | | builtin-notes: Add "copy" subcommand for copying notes between objectsJohan Herland2010-02-131-0/+63
| * | | builtin-notes: Add -c/-C options for reusing notesJohan Herland2010-02-131-0/+116
| * | | builtin-notes: Refactor handling of -F option to allow combining -m and -FJohan Herland2010-02-131-1/+22
| * | | builtin-notes: Deprecate the -m/-F options for "git notes edit"Johan Herland2010-02-133-5/+5
| * | | builtin-notes: Add "append" subcommand for appending to note objectsJohan Herland2010-02-131-0/+36
| * | | builtin-notes: Add "add" subcommand for adding notes to objectsJohan Herland2010-02-131-18/+37
| * | | builtin-notes: Add "list" subcommand for listing note objectsJohan Herland2010-02-131-0/+32
| * | | builtin-notes: Add "prune" subcommand for removing notes for missing objectsJohan Herland2010-02-131-0/+94
| * | | t3305: Verify that removing notes triggers automatic fanout consolidationJohan Herland2010-02-131-1/+46
| * | | builtin-notes: Add "remove" subcommand for removing existing notesJohan Herland2010-02-131-0/+27
| * | | Teach builtin-notes to remove empty notesJohan Herland2010-02-131-0/+31
| * | | Teach notes code to properly preserve non-notes in the notes treeJohan Herland2010-02-132-12/+52
| * | | t3305: Verify that adding many notes with git-notes triggers increased fanoutJohan Herland2010-02-131-0/+50
| * | | t3301: Verify successful annotation of non-commitsJohan Herland2010-02-131-0/+17
| * | | Builtin-ify git-notesJohan Herland2010-02-131-35/+63
| * | | Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRefJohan Herland2010-02-131-0/+48
* | | | Merge branch 'maint'Junio C Hamano2010-03-133-1/+30
|\ \ \ \
| * | | | don't use default revision if a rev was specifiedDave Olszewski2010-03-131-0/+9
| * | | | t/Makefile: remove test artifacts upon "make clean"Junio C Hamano2010-03-131-0/+2
| * | | | blame: fix indent of line numbersRené Scharfe2010-03-131-1/+19
* | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-03-132-0/+2
|\ \ \ \ \
| * | | | | t9150,t9151: Add rewrite-root option to initTuomas Suutari2010-03-132-0/+2
* | | | | | Merge branch 'maint'Junio C Hamano2010-03-121-12/+12
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | t9400: Use test_cmp when appropriateJunio C Hamano2010-03-111-12/+12
| * | | | Merge branch 'as/maint-expire' into maintJunio C Hamano2010-03-082-0/+73
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/fetch-param' into maintJunio C Hamano2010-03-081-26/+59
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/maint-add--interactive-delete' into maintJunio C Hamano2010-03-081-0/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mm/mkstemps-mode-for-packfiles' into maintJunio C Hamano2010-03-081-0/+67
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-fix-mailinfo-strip' into maintJunio C Hamano2010-03-081-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/grep-author-all-match-implicit' into maintJunio C Hamano2010-03-081-1/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-detached' into maintJunio C Hamano2010-03-081-10/+22
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'sd/init-template'Junio C Hamano2010-03-101-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \