summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ns/rebase-auto-squash'Junio C Hamano2010-01-201-0/+73
|\
| * rebase -i --autosquash: auto-squash commitsNanako Shiraishi2010-01-061-0/+73
* | Merge branch 'mh/rebase-fixup' (early part)Junio C Hamano2010-01-202-53/+94
|\ \
| * | rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-121-0/+24
| * | lib-rebase: Allow comments and blank lines to be added to the rebase scriptMichael Haggerty2010-01-121-5/+16
| * | lib-rebase: Provide clearer debugging info about what the editor didMichael Haggerty2010-01-121-2/+3
| |/
| * Add a command "fixup" to rebase --interactiveMichael Haggerty2009-12-072-3/+34
| * t3404: Use test_commit to set up test repositoryMichael Haggerty2009-12-061-46/+20
* | Merge branch 'il/push-set-upstream'Junio C Hamano2010-01-201-0/+69
|\ \
| * | Add push --set-upstreamIlari Liusvaara2010-01-161-0/+69
* | | Merge branch 'jk/warn-author-committer-after-commit'Junio C Hamano2010-01-202-1/+12
|\ \ \
| * | | commit: show interesting ident information in summaryJeff King2010-01-141-1/+5
| * | | strbuf_expand: convert "%%" to "%"Jeff King2010-01-141-0/+7
* | | | Merge branch 'tr/http-push-ref-status'Junio C Hamano2010-01-201-0/+44
|\ \ \ \
| * | | | transport-helper.c::push_refs(): ignore helper-reported status if ref is not ...Tay Ray Chuan2010-01-091-1/+1
| * | | | transport.c::transport_push(): make ref status affect return valueTay Ray Chuan2010-01-091-2/+2
| * | | | refactor ref status logic for pushingTay Ray Chuan2010-01-091-2/+2
| * | | | t5541-http-push.sh: add test for unmatched, non-fast-forwarded refsTay Ray Chuan2010-01-091-0/+21
| * | | | t5541-http-push.sh: add tests for non-fast-forward pushesTay Ray Chuan2010-01-091-0/+23
* | | | | Merge branch 'bk/fix-relative-gitdir-file'Junio C Hamano2010-01-201-0/+38
|\ \ \ \ \
| * | | | | Handle relative paths in submodule .git filesBrad King2010-01-091-1/+1
| * | | | | Test update-index for a gitlink to a .git fileBrad King2010-01-091-0/+38
* | | | | | Merge branch 'jc/rerere'Junio C Hamano2010-01-181-0/+15
|\ \ \ \ \ \
| * | | | | | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-0/+15
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano2010-01-181-0/+9
|\ \ \ \ \ \
| * | | | | | Remove empty directories when checking out a commit with fewer submodulesPeter Collingbourne2010-01-111-0/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'tc/test-locate-httpd'Junio C Hamano2010-01-171-6/+24
|\ \ \ \ \ \
| * | | | | | t/lib-http.sh: Restructure finding of default httpd locationTarmigan Casebolt2010-01-061-6/+24
| |/ / / / /
* | | | | | Merge branch 'jh/commit-status'Junio C Hamano2010-01-171-0/+109
|\ \ \ \ \ \
| * | | | | | t7502: test commit.status, --status and --no-statusJunio C Hamano2010-01-131-0/+109
* | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano2010-01-171-0/+57
|\ \ \ \ \ \ \
| * | | | | | | checkout -m path: fix recreating conflictsJunio C Hamano2010-01-061-0/+57
* | | | | | | | Merge branch 'tc/clone-v-progress'Junio C Hamano2010-01-171-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: use --progress to force progress reportingTay Ray Chuan2009-12-281-1/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'tc/smart-http-restrict'Junio C Hamano2010-01-175-260/+349
|\ \ \ \ \ \ \ \
| * | | | | | | | Test t5560: Fix test when run with dashTarmigan Casebolt2010-01-151-5/+10
| * | | | | | | | Smart-http tests: Test http-backend without curl or a webserverTarmigan Casebolt2010-01-062-6/+25
| * | | | | | | | Smart-http tests: Break test t5560-http-backend into piecesTarmigan Casebolt2010-01-063-147/+173
| * | | | | | | | Smart-http tests: Improve coverage in test t5560Tarmigan Casebolt2010-01-061-11/+10
| * | | | | | | | Smart-http: check if repository is OK to export before serving itTarmigan Casebolt2010-01-062-2/+42
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/run-command-use-shell'Junio C Hamano2010-01-173-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | t4030, t4031: work around bogus MSYS bash path conversionJohannes Sixt2010-01-052-2/+2
| * | | | | | | | textconv: use shell to run helperJeff King2010-01-052-2/+2
| * | | | | | | | t0021: use $SHELL_PATH for the filter scriptJohannes Sixt2010-01-051-1/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'sr/gfi-options'Junio C Hamano2010-01-171-0/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-import: add (non-)relative-marks featureSverre Rabbelier2009-12-051-0/+25
| * | | | | | | | fast-import: allow for multiple --import-marks= argumentsSverre Rabbelier2009-12-041-0/+22
| * | | | | | | | fast-import: test the new option commandSverre Rabbelier2009-12-041-1/+36
| * | | | | | | | fast-import: add feature commandSverre Rabbelier2009-12-041-0/+70
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'cc/reset-more'Junio C Hamano2010-01-161-10/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |