summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano2011-12-132-1/+20
|\
| * builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patchBrandon Casey2011-12-051-0/+19
| * t/t4131-apply-fake-ancestor.sh: fix broken testBrandon Casey2011-12-051-1/+1
* | Merge branch 'jn/branch-move-to-self'Junio C Hamano2011-12-132-4/+21
|\ \
| * | Allow checkout -B <current-branch> to update the current branchjn/branch-move-to-selfJonathan Nieder2011-11-281-4/+5
| * | branch: allow a no-op "branch -M <current-branch> HEAD"Jonathan Nieder2011-11-281-0/+16
* | | Merge branch 'jk/maint-upload-archive'Junio C Hamano2011-12-131-0/+8
|\ \ \
| * \ \ Merge branch 'jk/maint-1.6.2-upload-archive' into jk/maint-upload-archiveJunio C Hamano2011-11-211-0/+8
| |\ \ \ | | |_|/ | |/| |
| | * | archive: don't let remote clients get unreachable commitsjk/maint-1.6.2-upload-archiveJeff King2011-11-211-0/+8
* | | | Merge branch 'jn/gitweb-side-by-side-diff'Junio C Hamano2011-12-131-1/+72
|\ \ \ \
| * | | | t9500: Add basic sanity tests for side-by-side diff in gitwebJakub Narebski2011-10-311-1/+25
| * | | | t9500: Add test for handling incomplete lines in diff by gitwebJakub Narebski2011-10-311-0/+47
* | | | | git-p4: test for absolute PWD problemPete Wyckoff2011-12-111-0/+49
* | | | | git-p4: submit test for auto-creating clientPathPete Wyckoff2011-12-111-0/+38
* | | | | Merge branch 'jc/pull-signed-tag'Junio C Hamano2011-12-0963-186/+189
|\ \ \ \ \
| * | | | | merge: record tag objects without peeling in MERGE_HEADJunio C Hamano2011-11-081-1/+5
| * | | | | refs DWIMmery: use the same rule for both "git fetch" and othersJunio C Hamano2011-11-071-3/+2
| * | | | | merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-074-8/+8
| * | | | | fetch: do not store peeled tag object names in FETCH_HEADLinus Torvalds2011-11-0458-174/+174
* | | | | | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-091-0/+10
|\ \ \ \ \ \
| * | | | | | request-pull: use the annotated tag contentsJunio C Hamano2011-11-091-0/+4
| * | | | | | request-pull: state what commit to expectJunio C Hamano2011-10-051-0/+6
| * | | | | | Merge branch 'bk/ancestry-path' into jc/branch-descJunio C Hamano2011-09-211-0/+38
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'ab/pull-rebase-config'Junio C Hamano2011-12-091-2/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-configÆvar Arnfjörð Bjarmason2011-11-071-2/+21
* | | | | | | | | Merge branch 'gh/userdiff-matlab'Junio C Hamano2011-12-055-1/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add built-in diff patterns for MATLAB codegh/userdiff-matlabGustaf Hendeby2011-11-155-1/+34
* | | | | | | | | | git-p4: introduce skipSubmitEditPete Wyckoff2011-12-051-0/+82
* | | | | | | | | | revert --abort: do not leave behind useless sequencer-old directoryJonathan Nieder2011-11-231-0/+8
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | revert: remove --reset compatibility optionjn/revert-quitJonathan Nieder2011-11-221-2/+2
* | | | | | | | | revert: introduce --abort to cancel a failed cherry-pickJonathan Nieder2011-11-221-0/+96
* | | | | | | | | revert: write REVERT_HEAD pseudoref during conflicted revertJonathan Nieder2011-11-221-0/+54
* | | | | | | | | revert: rename --reset option to --quitJonathan Nieder2011-11-222-6/+27
* | | | | | | | | t5501-*.sh: Fix url passed to clone in setup testRamsay Jones2011-11-201-1/+1
* | | | | | | | | refs: loosen over-strict "format" checkJunio C Hamano2011-11-161-0/+7
* | | | | | | | | Revert "upload-archive: use start_command instead of fork"Junio C Hamano2011-11-151-5/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'ab/i18n-test-fix'Junio C Hamano2011-11-062-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | t/t7508-status.sh: use test_i18ncmpab/i18n-test-fixÆvar Arnfjörð Bjarmason2011-11-051-2/+2
| * | | | | | | | t/t6030-bisect-porcelain.sh: use test_i18ngrepÆvar Arnfjörð Bjarmason2011-11-051-1/+1
* | | | | | | | | Merge branch 'pw/p4-appledouble-fix'Junio C Hamano2011-11-061-0/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: ignore apple filetypePete Wyckoff2011-11-051-0/+31
* | | | | | | | | | t3200: add test case for 'branch -m'Stefan Naewe2011-11-021-0/+5
* | | | | | | | | | Sync with 1.7.7.2Junio C Hamano2011-11-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-11-011-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | t7511: avoid use of reserved filename on Windows.Pat Thoyts2011-10-311-1/+1
| * | | | | | | | | | Merge branch 'bc/attr-ignore-case' into maintJunio C Hamano2011-11-011-1/+58
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-011-0/+50
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/blame-textconv-fake-working-tree'Junio C Hamano2011-11-011-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | (squash) test for previousJunio C Hamano2011-10-281-0/+11
* | | | | | | | | | | | | | Merge branch 'ef/mingw-upload-archive'Junio C Hamano2011-11-011-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |