summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/gitweb-unborn-head' into maintJunio C Hamano2012-02-271-0/+9
|\
| * gitweb: Fix "heads" view when there is no current branchjn/gitweb-unborn-headJakub Narebski2012-02-171-0/+9
* | Merge branch 'jc/add-refresh-unmerged' into maintJunio C Hamano2012-02-261-0/+15
|\ \
| * | refresh_index: do not show unmerged path that is outside pathspecjc/add-refresh-unmergedJunio C Hamano2012-02-171-0/+15
* | | Sync with 1.7.8.5Junio C Hamano2012-02-261-0/+10
|\ \ \
| * | | am: don't infloop for an empty input fileJim Meyering2012-02-261-0/+10
* | | | git-p4: remove bash-ism in t9800Pete Wyckoff2012-02-261-9/+15
* | | | git-p4: remove bash-ism in t9809Pete Wyckoff2012-02-261-1/+1
* | | | git-p4: fix submit regression with clientSpec and subdir clonePete Wyckoff2012-02-261-11/+131
* | | | git-p4: set useClientSpec variable on initial clonePete Wyckoff2012-02-261-0/+17
* | | | Merge branch 'cb/receive-pack-keep-errors' into maintJunio C Hamano2012-02-211-4/+18
|\ \ \ \
| * | | | do not override receive-pack errorscb/receive-pack-keep-errorsClemens Buchacher2012-02-131-4/+18
| |/ / /
* | | | Merge branch 'cb/transfer-no-progress' into maintJunio C Hamano2012-02-211-1/+2
|\ \ \ \
| * | | | push/fetch/clone --no-progress suppresses progress outputcb/transfer-no-progressClemens Buchacher2012-02-131-1/+2
* | | | | Merge branch 'jk/git-dir-lookup' into maintJunio C Hamano2012-02-211-0/+100
|\ \ \ \ \
| * | | | | standardize and improve lookup rules for external local reposjk/git-dir-lookupJeff King2012-02-021-0/+100
* | | | | | Merge branch 'cb/maint-rev-list-verify-object' into maintJunio C Hamano2012-02-211-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 'cb/maint-t5541-make-server-port-portable' into maintJunio C Hamano2012-02-211-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 'jk/grep-binary-attribute' into maintJunio C Hamano2012-02-211-0/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: respect diff attributes for binary-nessJeff King2012-02-021-0/+24
* | | | | | | | | Merge branch 'nd/diffstat-gramnum' into maintJunio C Hamano2012-02-2164-109/+109
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-0364-109/+109
| |/ / / / / / / /
* | | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unbornJunio C Hamano2012-02-061-1/+10
* | | | | | | | | Merge branch 'jc/maint-commit-ignore-i-t-a' into maintJunio C Hamano2012-02-161-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' into maintJunio C Hamano2012-02-131-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' into maintJunio C Hamano2012-02-131-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' into maintJunio C Hamano2012-02-131-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' into maintJunio C Hamano2012-02-131-0/+13
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-051-0/+13
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-132-4/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-051-4/+37
| * | | | | | | | tests: add write_script helper functionJunio C Hamano2012-02-031-0/+9
| |/ / / / / / /
* | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tagJunio C Hamano2012-01-311-5/+1
* | | | | | | | | Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-101-0/+22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: fix -l/-L interaction with decoration linestr/grep-l-with-decorationAlbert Yale2012-01-231-0/+22
* | | | | | | | | | Merge branch 'jl/submodule-re-add' into maintJunio C Hamano2012-02-101-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule add: fix breakage when re-adding a deep submodulejl/submodule-re-addJens Lehmann2012-01-241-0/+8