summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-242-9/+97
|\
| * git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-131-0/+5
| * git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-121-3/+81
| * git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-081-3/+3
| * git diff --submodule: Show detailed dirty status of submodulesJens Lehmann2010-03-041-6/+11
* | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-247-0/+543
|\ \
| * | show --first-parent/-m: do not default to --ccJunio C Hamano2010-03-093-0/+125
| * | show -c: show patch textJunio C Hamano2010-03-092-0/+37
| * | t4013: add tests for log -p -m --first-parentJunio C Hamano2010-03-094-0/+381
* | | Merge branch 'jc/maint-refs-dangling'Junio C Hamano2010-03-241-3/+3
|\ \ \
| * | | refs: ref entry with NULL sha1 is can be a dangling symrefJunio C Hamano2010-03-151-3/+3
* | | | Merge branch 'jk/maint-add-ignored-dir'Junio C Hamano2010-03-202-2/+85
|\ \ \ \
| * | | | tests for "git add ignored-dir/file" without -fJunio C Hamano2010-03-131-0/+79
| * | | | t0050: mark non-working test as suchJunio C Hamano2010-03-131-2/+6
* | | | | Merge branch 'jc/color-attrs'Junio C Hamano2010-03-201-4/+11
|\ \ \ \ \
| * | | | | color: allow multiple attributesJunio C Hamano2010-03-071-4/+11
* | | | | | Merge branch 'cc/reset-keep'Junio C Hamano2010-03-203-10/+139
|\ \ \ \ \ \
| * | | | | | reset: disallow using --keep when there are unmerged entriesChristian Couder2010-03-062-15/+10
| * | | | | | reset: disallow "reset --keep" outside a work treeChristian Couder2010-03-061-8/+17
| * | | | | | reset: add test cases for "--keep" optionChristian Couder2010-01-242-1/+126
* | | | | | | 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
View Lorry Controller Status