summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2011-10-271-0/+50
|\
| * Merge branch 'rs/maint-estimate-cache-size' into maintJunio C Hamano2011-10-271-0/+50
| |\
| | * read-cache.c: fix index memory allocationRené Scharfe2011-10-261-0/+50
| * | Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-264-18/+85
| |\ \
| | * \ Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano2011-10-261-18/+40
| | |\ \
| | * \ \ Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-261-0/+31
| | |\ \ \
| | * \ \ \ Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano2011-10-261-0/+8
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2011-10-261-0/+6
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'maint-1.7.6' into maintJunio C Hamano2011-10-262-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6Junio C Hamano2011-10-262-0/+6
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'cb/maint-ls-files-error-report' into maintJunio C Hamano2011-09-231-0/+72
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jc/maint-clone-alternates' into maintJunio C Hamano2011-09-231-0/+23
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'nd/maint-clone-gitdir' into maintJunio C Hamano2011-09-231-0/+4
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'mh/check-ref-format-print-normalize' into maintJunio C Hamano2011-09-231-0/+9
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'mg/branch-set-upstream-previous' into maintJunio C Hamano2011-09-231-0/+14
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reset-reflog-message-fix' into maintJunio C Hamano2011-09-111-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vi/make-test-vector-less-specific' into maintJunio C Hamano2011-09-118-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-config-param' into maintJunio C Hamano2011-09-111-0/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-1.7.2-status-ignored' into maintJunio C Hamano2011-09-111-0/+121
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-211-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-211-0/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-211-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bk/ancestry-path' into maintJunio C Hamano2011-10-151-0/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/mergetool-valgrind' into maintJunio C Hamano2011-10-151-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/rebase-i-exec-edit' into maintJunio C Hamano2011-10-151-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lh/gitweb-site-html-head'Junio C Hamano2011-10-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | gitweb: provide a way to customize html headersLénaïc Huard2011-10-211-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/libperl-git-config'Junio C Hamano2011-10-262-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Add simple test for Git::config_path() in t/t9700-perl-git.shJakub Narebski2011-10-212-1/+9
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cn/fetch-prune'Junio C Hamano2011-10-261-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | fetch: treat --tags like refs/tags/*:refs/tags/* when pruningCarlos Martín Nieto2011-10-151-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | fetch: honor the user-provided refspecs when pruning refsCarlos Martín Nieto2011-10-151-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | t5510: add tests for fetch --pruneCarlos Martín Nieto2011-10-071-0/+50
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-update'Junio C Hamano2011-10-215-324/+731
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle files with shell metacharactersLuke Diamand2011-10-171-0/+64
| * | | | | | | | | | | | | | | | | | | | | | | | git-p4: handle utf16 filetype properlyPete Wyckoff2011-10-171-0/+108
| * | | | | | | | | | | | | | | | | | | | | | | | git-p4 tests: refactor and cleanupPete Wyckoff2011-10-173-324/+559
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sc/difftool-skip'Junio C Hamano2011-10-211-1/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t7800: avoid arithmetic expansion notationsc/difftool-skipJunio C Hamano2011-10-141-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty2011-10-101-1/+42
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ph/transport-with-gitfile'Junio C Hamano2011-10-211-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Add test showing git-fetch groks gitfilesPhil Hord2011-10-041-0/+14
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | tests: add missing executable bitsJeff King2011-10-202-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir scriptBrandon Casey2011-10-191-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-191-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Teach merge the '[-e|--edit]' optionJay Soffian2011-10-121-0/+23
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-191-0/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-101-0/+92
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-191-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-061-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status