aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* cherry-pick, revert: add a label for ancestorJonathan Nieder2010-03-20
* revert: clarify label on conflict hunksJonathan Nieder2010-03-20
* checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-20
* checkout --conflict=diff3: add a label for ancestorJonathan Nieder2010-03-20
* merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-20
* tests: document cherry-pick behavior in face of conflictsJonathan Nieder2010-03-20
* tests: document format of conflicts from checkout -mJonathan Nieder2010-03-20
* Merge branch 'jk/maint-add-ignored-dir'Junio C Hamano2010-03-20
|\
| * tests for "git add ignored-dir/file" without -fJunio C Hamano2010-03-13
| * t0050: mark non-working test as suchJunio C Hamano2010-03-13
* | Merge branch 'jc/color-attrs'Junio C Hamano2010-03-20
|\ \
| * | color: allow multiple attributesJunio C Hamano2010-03-07
* | | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-20
|\ \ \
| * | | reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-06
| * | | reset: disallow "reset --keep" outside a work treeChristian Couder2010-03-06
| * | | reset: add test cases for "--keep" optionChristian Couder2010-01-24
* | | | Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-20
|\ \ \ \
| * | | | t3417: Add test cases for "rebase --whitespace=fix"Björn Gustavsson2010-03-06
| * | | | t4124: Add additional tests of --whitespace=fixBjörn Gustavsson2010-03-06
| * | | | apply: Remove the quick rejection testBjörn Gustavsson2010-03-06
* | | | | Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-20
|\ \ \ \ \
| * | | | | merge-file: add option to specify the marker sizeBert Wesarg2010-03-02
| |/ / / /
* | | | | Use test_expect_success for test setupsBrian Gernhardt2010-03-20
* | | | | Merge branch 'sd/format-patch-to'Junio C Hamano2010-03-15
|\ \ \ \ \
| * | | | | send-email: add --no-cc, --no-to, and --no-bccStephen Boyd2010-03-08
| * | | | | format-patch: add --no-cc, --no-to, and --no-add-headersStephen Boyd2010-03-08
| * | | | | Add 'git format-patch --to=' option and 'format.to' configuration variable.Steven Drake2010-03-06
| |/ / / /
* | | | | Merge branch 'tc/http-cleanup'Junio C Hamano2010-03-15
|\ \ \ \ \
| * | | | | t554[01]-http-push: refactor, add non-ff testsTay Ray Chuan2010-03-02
| * | | | | t5541-http-push: check that ref is unchanged for non-ff testTay Ray Chuan2010-03-02
| |/ / / /
* | | | | Merge branch 'ld/push-porcelain'Junio C Hamano2010-03-15
|\ \ \ \ \
| * | | | | t5516: Use test_cmp when appropriateJunio C Hamano2010-03-11
| * | | | | git-push: add tests for git push --porcelainLarry D'Anna2010-02-28
* | | | | | Merge branch 'jh/notes'Junio C Hamano2010-03-15
|\ \ \ \ \ \
| * | | | | | builtin-notes: Add "copy" subcommand for copying notes between objectsJohan Herland2010-02-13
| * | | | | | builtin-notes: Add -c/-C options for reusing notesJohan Herland2010-02-13
| * | | | | | builtin-notes: Refactor handling of -F option to allow combining -m and -FJohan Herland2010-02-13
| * | | | | | builtin-notes: Deprecate the -m/-F options for "git notes edit"Johan Herland2010-02-13
| * | | | | | builtin-notes: Add "append" subcommand for appending to note objectsJohan Herland2010-02-13
| * | | | | | builtin-notes: Add "add" subcommand for adding notes to objectsJohan Herland2010-02-13
| * | | | | | builtin-notes: Add "list" subcommand for listing note objectsJohan Herland2010-02-13
| * | | | | | builtin-notes: Add "prune" subcommand for removing notes for missing objectsJohan Herland2010-02-13
| * | | | | | t3305: Verify that removing notes triggers automatic fanout consolidationJohan Herland2010-02-13
| * | | | | | builtin-notes: Add "remove" subcommand for removing existing notesJohan Herland2010-02-13
| * | | | | | Teach builtin-notes to remove empty notesJohan Herland2010-02-13
| * | | | | | Teach notes code to properly preserve non-notes in the notes treeJohan Herland2010-02-13
| * | | | | | t3305: Verify that adding many notes with git-notes triggers increased fanoutJohan Herland2010-02-13
| * | | | | | t3301: Verify successful annotation of non-commitsJohan Herland2010-02-13
| * | | | | | Builtin-ify git-notesJohan Herland2010-02-13
| * | | | | | Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRefJohan Herland2010-02-13