summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* refresh_index: do not show unmerged path that is outside pathspecjc/add-refresh-unmergedJunio C Hamano2012-02-171-0/+15
* 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
* | | | | | | Merge branch 'da/maint-mergetool-twoway' into maintJunio C Hamano2012-02-101-1/+27
|\ \ \ \ \ \ \
| * | | | | | | mergetool: Provide an empty file when neededda/maint-mergetool-twowayDavid Aguilar2012-01-231-1/+27
* | | | | | | | Merge branch 'sp/smart-http-failure-to-push' into maintJunio C Hamano2012-02-051-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-curl: Fix push status report when all branches failShawn O. Pearce2012-01-201-0/+28
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jc/maint-log-first-parent-pathspec' into maintJunio C Hamano2012-02-051-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Making pathspec limited log play nicer with --first-parentjc/maint-log-first-parent-pathspecJunio C Hamano2012-01-191-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'cb/push-quiet' into maintJunio C Hamano2012-02-052-0/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | t5541: avoid TAP test miscountingcb/push-quietMichael J Gruber2012-01-081-1/+1
| * | | | | | | fix push --quiet: add 'quiet' capability to receive-packClemens Buchacher2012-01-082-0/+15
* | | | | | | | Merge branch 'nd/pathspec-recursion-cleanup'Junio C Hamano2012-01-181-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-index: enable recursive pathspec matching in unpack_treesnd/pathspec-recursion-cleanupNguyen Thai Ngoc Duy2012-01-161-0/+8
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano2012-01-181-0/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | word-diff: ignore '\ No newline at eof' markertr/maint-word-diff-incomplete-lineThomas Rast2012-01-121-0/+14
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ss/maint-msys-cvsexportcommit'Junio C Hamano2012-01-121-3/+3
|\ \ \ \ \ \ \
| * | | | | | | t9200: On MSYS, do not pass Windows-style paths to CVSSebastian Schuberth2012-01-111-3/+3
* | | | | | | | Merge branch 'maint'Junio C Hamano2012-01-111-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-111-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-111-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | t2203: fix wrong commit commandNguyễn Thái Ngọc Duy2012-01-111-1/+1
* | | | | | | | | Merge branch 'bw/maint-t8006-sed-incomplete-line'Junio C Hamano2012-01-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use perl instead of sed for t8006-blame-textconv testbw/maint-t8006-sed-incomplete-lineBen Walton2012-01-091-1/+1
* | | | | | | | | | Sync with maintJunio C Hamano2012-01-101-0/+10
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-101-0/+10
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-101-0/+10
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | attr: don't confuse prefixes with leading directoriesJeff King2012-01-101-0/+10
* | | | | | | | | Merge branch 'jc/show-sig'Junio C Hamano2012-01-061-0/+80
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status