summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hv/remote-end-hung-up'Junio C Hamano2012-07-041-9/+7
|\
| * remove the impression of unexpectedness when access is deniedHeiko Voigt2012-06-191-9/+7
* | Merge branch 'fc/git-prompt-script'Junio C Hamano2012-06-283-13/+475
|\ \
| * | completion: respect $GIT_DIRSZEDER Gábor2012-06-191-1/+9
| * | completion: split __git_ps1 into a separate scriptFelipe Contreras2012-05-221-1/+1
| * | Merge branch 'fc/git-complete-helper' into fc/git-prompt-scriptJunio C Hamano2012-05-227-41/+160
| |\ \
| * | | tests: add tests for the bash prompt functions in the completion scriptSZEDER Gábor2012-05-091-0/+448
| * | | tests: move code to run tests under bash into a helper librarySZEDER Gábor2012-05-092-13/+19
* | | | Merge branch 'js/submodule-relative'Junio C Hamano2012-06-282-4/+235
|\ \ \ \
| * | | | t7400: avoid path mangling issuesJohannes Sixt2012-06-141-3/+8
| * | | | submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo...Jon Seymour2012-06-062-6/+6
| * | | | submodule: fix sync handling of some relative superproject origin URLsJon Seymour2012-06-061-4/+4
| * | | | submodule: document failure to handle relative superproject origin URLsJon Seymour2012-06-032-1/+123
| * | | | submodule: additional regression tests for relative URLsJon Seymour2012-06-031-3/+107
* | | | | Merge branch 'lk/more-helpful-status-hints'Junio C Hamano2012-06-282-0/+745
|\ \ \ \ \
| * | | | | status: better advices when splitting a commit (during rebase -i)Lucien Kong2012-06-141-0/+277
| * | | | | status: don't suggest "git rm" or "git add" if not appropriateLucien Kong2012-06-142-6/+38
| * | | | | t7512-status-help.sh: better advices for git statusLucien Kong2012-06-141-0/+372
| * | | | | wt-status.*: better advices for git status addedLucien Kong2012-06-141-0/+64
* | | | | | Merge branch 'lk/rebase-i-x'Junio C Hamano2012-06-281-0/+117
|\ \ \ \ \ \
| * | | | | | rebase -i: teach "--exec <cmd>"Lucien Kong2012-06-131-0/+117
| |/ / / / /
* | | | | | Merge branch 'nd/stream-pack-objects'Junio C Hamano2012-06-281-0/+12
|\ \ \ \ \ \
| * | | | | | pack-objects: use streaming interface for reading large loose blobsNguyễn Thái Ngọc Duy2012-05-291-0/+12
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nd/stream-index-pack'Junio C Hamano2012-06-282-0/+10
|\ \ \ \ \ \
| * | | | | | index-pack: use streaming interface for collision test on large blobsNguyễn Thái Ngọc Duy2012-05-241-0/+5
| * | | | | | index-pack: use streaming interface on large blobs (most of the time)Nguyễn Thái Ngọc Duy2012-05-231-0/+5
* | | | | | | Merge branch 'mm/verify-filename-fix'Junio C Hamano2012-06-281-0/+11
|\ \ \ \ \ \ \
| * | | | | | | verify_filename(): ask the caller to chose the kind of diagnosisMatthieu Moy2012-06-181-1/+1
| * | | | | | | sha1_name: do not trigger detailed diagnosis for file argumentsMatthieu Moy2012-06-181-0/+11
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-06-222-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: Fix misspellingsLeila Muhtasib2012-06-222-3/+3
* | | | | | | | | Merge branch 'jk/maint-t1304-setfacl'Junio C Hamano2012-06-211-10/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t1304: improve setfacl prerequisite setupJeff King2012-06-071-10/+9
* | | | | | | | | | Merge branch 'jk/clone-local'Junio C Hamano2012-06-211-0/+10
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | clone: allow --no-local to turn off local optimizationsJeff King2012-05-301-0/+10
* | | | | | | | | | Merge branch 'as/diff-shortstat-ignore-binary'Junio C Hamano2012-06-151-0/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: Only count lines in show_shortstatsAlexander Strasser2012-06-151-0/+12
* | | | | | | | | | | Merge branch 'rj/gitweb-test-sans-date-parser'Junio C Hamano2012-06-131-7/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: Skip 'modification times' tests when no date parser availableRamsay Jones2012-06-121-7/+14
* | | | | | | | | | | | Merge branch 'fc/git-complete-helper-fix'Junio C Hamano2012-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: put main git and gitk completion functions back into git namespaceSZEDER Gábor2012-06-131-1/+1
* | | | | | | | | | | | | Merge branch 'jc/fmt-merge-msg-people'Junio C Hamano2012-06-121-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fmt-merge-msg: make attribution into comment linesJunio C Hamano2012-06-061-18/+18
* | | | | | | | | | | | | | Merge branch 'rr/maint-t3510-cascade-fix'Junio C Hamano2012-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | t3510 (cherry-pick-sequence): add missing '&&'Ramkumar Ramachandra2012-06-041-1/+1
* | | | | | | | | | | | | | Merge branch 'ef/maint-rebase-error-message'Junio C Hamano2012-06-011-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase: report invalid commit correctlyErik Faye-Lund2012-05-301-0/+5
* | | | | | | | | | | | | | | Merge branch 'nh/empty-rebase'Junio C Hamano2012-06-011-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | cherry-pick: regression fix for empty commitsJunio C Hamano2012-05-291-0/+30
* | | | | | | | | | | | | | | t5701: modernize styleJeff King2012-05-291-53/+20