summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-111-1/+58
* | | Merge branch 'cn/fetch-prune' into maintJunio C Hamano2011-11-011-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 '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
| |\ \ \ \
| | * | | | mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-261-18/+40
| * | | | | Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano2011-10-261-0/+31
| |\ \ \ \ \
| | * | | | | remote: only update remote-tracking branch if updating refspecMartin von Zweigbergk2011-09-111-1/+2
| | * | | | | remote: "rename o foo" should not rename ref "origin/bar"Martin von Zweigbergk2011-09-111-0/+10
| | * | | | | remote: write correct fetch spec when renaming remote 'remote'Martin von Zweigbergk2011-09-111-0/+20
| * | | | | | Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6Junio C Hamano2011-10-261-0/+8
| |\ \ \ \ \ \
| | * | | | | | t9159-*.sh: skip for mergeinfo test for svn <= 1.4Ramsay Jones2011-09-211-0/+8
| | |/ / / / /
| * | | | | | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6Junio C Hamano2011-10-261-0/+6
| |\ \ \ \ \ \
| | * | | | | | date.c: Support iso8601 timezone formatsHaitao Li2011-09-121-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
| |\ \ \ \ \
| | * | | | | unpack-trees: print "Aborting" to stderrMichael J Gruber2011-09-212-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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-121-0/+43
* | | | | | | | | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano2011-10-211-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-301-0/+42
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano2011-10-211-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-101-0/+6
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'bk/ancestry-path' into maintJunio C Hamano2011-10-151-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t6019: avoid refname collision on case-insensitive systemsThomas Rast2011-09-151-8/+11
| * | | | | | | | | | | | | | | revision: do not include sibling history in --ancestry-path outputJunio C Hamano2011-08-251-1/+1
| * | | | | | | | | | | | | | | rev-list: Demonstrate breakage with --ancestry-path --allBrad King2011-08-251-0/+35
* | | | | | | | | | | | | | | | Merge branch 'tr/mergetool-valgrind' into maintJunio C Hamano2011-10-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Symlink mergetools scriptlets into valgrind wrappersThomas Rast2011-08-301-0/+2
* | | | | | | | | | | | | | | | | Merge branch 'mm/rebase-i-exec-edit' into maintJunio C Hamano2011-10-151-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rebase -i: clean error message for --continue after failed execMatthieu Moy2011-08-261-0/+14
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'jc/no-gitweb-test-without-cgi-etc' into maintJunio C Hamano2011-08-231-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | t1304: fall back to $USER if $LOGNAME is not definedRené Scharfe2011-10-141-0/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'ph/format-patch-no-color'Junio C Hamano2011-09-191-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \