summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cb/receive-pack-keep-errors'Junio C Hamano2012-02-201-4/+18
|\
| * do not override receive-pack errorscb/receive-pack-keep-errorsClemens Buchacher2012-02-131-4/+18
* | Merge branch 'cb/maint-t5541-make-server-port-portable'Junio C Hamano2012-02-201-1/+1
|\ \
| * | t5541: check error message against the real port number usedcb/maint-t5541-make-server-port-portableClemens Buchacher2012-02-131-1/+1
* | | Merge branch 'cb/maint-rev-list-verify-object'Junio C Hamano2012-02-201-0/+26
|\ \ \
| * | | git rev-list: fix invalid typecastcb/maint-rev-list-verify-objectClemens Buchacher2012-02-131-0/+26
| | |/ | |/|
| * | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-181-0/+8
| |\ \
| | * | diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy2012-01-181-0/+8
* | | | Merge branch 'maint'Junio C Hamano2012-02-201-0/+39
|\ \ \ \
| * | | | gitweb: Fix 'grep' search for multiple matches in fileJakub Narebski2012-02-191-0/+39
| * | | | Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-161-1/+10
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/maint-commit-ignore-i-t-a' into maintJunio C Hamano2012-02-161-3/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-131-0/+13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-131-0/+12
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jk/git-dir-lookup'Junio C Hamano2012-02-141-0/+100
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | standardize and improve lookup rules for external local reposjk/git-dir-lookupJeff King2012-02-021-0/+100
* | | | | | | | | | Merge branch 'jk/grep-binary-attribute'Junio C Hamano2012-02-141-0/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: respect diff attributes for binary-nessJeff King2012-02-021-0/+24
* | | | | | | | | | | Merge branch 'nd/pack-objects-parseopt'Junio C Hamano2012-02-142-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-objects: remove bogus commentNguyễn Thái Ngọc Duy2012-02-011-0/+4
| * | | | | | | | | | | pack-objects: do not accept "--index-version=version,"Nguyễn Thái Ngọc Duy2012-02-011-0/+4
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'mh/war-on-extra-refs'Junio C Hamano2012-02-141-3/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | everything_local(): mark alternate refs as completeMichael Haggerty2012-02-121-1/+1
| * | | | | | | | | | | t5700: document a failure of alternates to affect fetchMichael Haggerty2012-02-121-3/+31
* | | | | | | | | | | | Sync with maintJunio C Hamano2012-02-139-143/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-131-0/+23
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-131-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-132-4/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-136-10/+10
| * | | | | | | | | | | | | | Remove Git's support for smoke testingÆvar Arnfjörð Bjarmason2012-02-133-133/+1
| * | | | | | | | | | | | | | Merge branch 'jc/maint-request-pull-for-tag' into maintJunio C Hamano2012-02-101-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-101-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jl/submodule-re-add' into maintJunio C Hamano2012-02-101-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/maint-mergetool-twoway' into maintJunio C Hamano2012-02-101-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano2012-02-051-0/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-log-first-parent-pathspec' into maintJunio C Hamano2012-02-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-052-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/checkout-out-of-unborn'Junio C Hamano2012-02-121-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unbornJunio C Hamano2012-02-061-1/+10
* | | | | | | | | | | | | | | | | | | | Merge branch 'nd/diffstat-gramnum'Junio C Hamano2012-02-1264-109/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-0364-109/+109
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-commit-ignore-i-t-a'Junio C Hamano2012-02-121-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | commit: ignore intent-to-add entries instead of refusingjc/maint-commit-ignore-i-t-aJunio C Hamano2012-02-071-3/+5
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-tag-show-fixes'Junio C Hamano2012-02-121-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixesJunio C Hamano2012-02-081-0/+13
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jn/merge-no-edit-fix'Junio C Hamano2012-02-121-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-091-0/+12
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/parse-date-raw'Junio C Hamano2012-02-101-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | parse_date(): '@' prefix forces git-timestampjc/parse-date-rawJunio C Hamano2012-02-031-0/+23
* | | | | | | | | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge'Junio C Hamano2012-02-101-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |