summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* commit: avoid race when creating orphan commitsMichael Haggerty2015-02-171-1/+1
* commit: add tests of commit racesMichael Haggerty2015-02-171-0/+30
* Merge branch 'jc/push-to-checkout'Junio C Hamano2015-02-111-0/+63
|\
| * receive-pack: support push-to-checkout hookjc/push-to-checkoutJunio C Hamano2015-01-081-0/+63
* | Merge branch 'sb/atomic-push'Junio C Hamano2015-02-111-0/+194
|\ \
| * | t5543-atomic-push.sh: add basic tests for atomic pushesStefan Beller2015-01-071-0/+194
* | | Merge branch 'cj/log-invert-grep'Junio C Hamano2015-02-111-0/+15
|\ \ \
| * | | log: teach --invert-grep optioncj/log-invert-grepChristoph Junghans2015-01-131-0/+15
* | | | Merge branch 'dk/format-patch-ignore-diff-submodule'Junio C Hamano2015-02-111-0/+72
|\ \ \ \
| * | | | format-patch: ignore diff.submodule settingdk/format-patch-ignore-diff-submoduleDoug Kelly2015-01-071-2/+2
| * | | | t4255: test am submodule with diff.submoduleDoug Kelly2015-01-071-0/+72
* | | | | Merge branch 'ld/p4-exclude-in-sync'Junio C Hamano2015-02-111-0/+71
|\ \ \ \ \
| * | | | | git-p4: support excluding paths on syncld/p4-exclude-in-syncLuke Diamand2015-02-111-0/+71
* | | | | | Merge branch 'ak/typofixes'Junio C Hamano2015-02-111-1/+1
|\ \ \ \ \ \
| * | | | | | t/lib-terminal.sh: fix typoak/typofixesAlexander Kuleshov2015-01-211-1/+1
* | | | | | | Merge branch 'js/t1050'Junio C Hamano2015-01-221-6/+6
|\ \ \ \ \ \ \
| * | | | | | | t1050-large: generate large files without ddjs/t1050Johannes Sixt2015-01-141-6/+6
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano2015-01-121-1/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maintJunio C Hamano2015-01-121-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/for-each-reflog-ent-reverse' into maintJunio C Hamano2015-01-121-0/+30
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jh/empty-notes'Junio C Hamano2015-01-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix unclosed here document in t3301.shjh/empty-notesKacper Kornet2015-01-221-1/+1
* | | | | | | | | | Merge branch 'jk/colors'Junio C Hamano2015-01-201-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | parse_color: fix return value for numeric color values 0-8Jeff King2015-01-201-0/+4
* | | | | | | | | | | Merge branch 'rc/for-each-ref-tracking'Junio C Hamano2015-01-141-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | for-each-ref: always check stat_tracking_info()'s return valuerc/for-each-ref-trackingRaphael Kubo da Costa2015-01-121-0/+13
* | | | | | | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Junio C Hamano2015-01-141-44/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test-lib.sh: do tests for color support after changing HOMERichard Hansen2015-01-071-43/+47
| * | | | | | | | | | | | test-lib: use 'test ...' instead of '[ ... ]'Richard Hansen2015-01-071-3/+3
* | | | | | | | | | | | | Merge branch 'rh/hide-prompt-in-ignored-directory'Junio C Hamano2015-01-141-0/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-prompt.sh: allow to hide prompt for ignored pwdrh/hide-prompt-in-ignored-directoryJess Austin2015-01-071-0/+106
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'jk/prune-packed-server-info'Junio C Hamano2015-01-141-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | update-server-info: create info/* with mode 0666jk/prune-packed-server-infoJeff King2015-01-061-0/+10
| * | | | | | | | | | | | | t1301: set umask in reflog sharedrepository=group testJeff King2015-01-061-0/+1
* | | | | | | | | | | | | | Merge branch 'js/remote-add-with-insteadof'Junio C Hamano2015-01-141-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add a regression test for 'git remote add <existing> <same-url>'js/remote-add-with-insteadofJohannes Schindelin2014-12-231-0/+5
* | | | | | | | | | | | | | | Merge branch 'es/checkout-index-temp'Junio C Hamano2015-01-121-195/+205
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | checkout-index: fix --temp relative path manglinges/checkout-index-tempEric Sunshine2014-12-291-1/+1
| * | | | | | | | | | | | | | | t2004: demonstrate broken relative path printingEric Sunshine2014-12-291-0/+12
| * | | | | | | | | | | | | | | t2004: standardize file naming in symlink testEric Sunshine2014-12-291-3/+3
| * | | | | | | | | | | | | | | t2004: drop unnecessary write-tree/read-treeEric Sunshine2014-12-291-3/+0
| * | | | | | | | | | | | | | | t2004: modernize styleEric Sunshine2014-12-291-195/+196
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'cc/bisect-rev-parsing'Junio C Hamano2015-01-121-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | bisect: add test to check that revs are properly parsedcc/bisect-rev-parsingChristian Couder2014-12-291-0/+9
* | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2015-01-071-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'maint-2.1' into maintJunio C Hamano2015-01-071-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | / / / | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'maint-2.0' into maint-2.1maint-2.1Junio C Hamano2015-01-071-0/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-071-0/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-071-0/+15
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-071-0/+15
| | | | | |\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status