summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/upload-pack-hook'Junio C Hamano2016-07-063-0/+125
|\
| * upload-pack: provide a hook for running pack-objectsJeff King2016-06-021-0/+62
| * t1308: do not get fooled by symbolic links to the source treeJunio C Hamano2016-06-021-1/+1
| * config: add a notion of "scope"Jeff King2016-05-272-0/+19
| * config: return configset value for current_config_ functionsJeff King2016-05-272-0/+44
* | Merge branch 'nd/test-lib-httpd-show-error-log-in-verbose'Junio C Hamano2016-07-061-0/+1
|\ \
| * | lib-httpd.sh: print error.log on errornd/test-lib-httpd-show-error-log-in-verboseNguyễn Thái Ngọc Duy2016-06-131-0/+1
* | | Merge branch 'jk/string-list-static-init'Junio C Hamano2016-07-061-1/+1
|\ \ \
| * | | use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-131-1/+1
* | | | Merge branch 'et/add-chmod-x'Junio C Hamano2016-06-271-0/+30
|\ \ \ \
| * | | | add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-071-0/+30
* | | | | Merge branch 'sg/reflog-past-root'Junio C Hamano2016-06-272-1/+23
|\ \ \ \ \
| * | | | | reflog: continue walking the reflog past root commitsSZEDER Gábor2016-06-062-1/+23
* | | | | | Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano2016-06-207-77/+278
|\ \ \ \ \ \
| * | | | | | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-lineRené Scharfe2016-06-091-1/+23
| * | | | | | grep: -W: don't extend context to trailing empty linesRené Scharfe2016-05-311-1/+1
| * | | | | | t7810: add test for grep -W and trailing empty context linesRené Scharfe2016-05-311-3/+16
| * | | | | | xdiff: don't trim common tail with -WRené Scharfe2016-05-311-1/+1
| * | | | | | xdiff: -W: don't include common trailing empty lines in contextRené Scharfe2016-05-311-2/+2
| * | | | | | xdiff: ignore empty lines before added functions with -WRené Scharfe2016-05-311-1/+1
| * | | | | | xdiff: handle appended chunks better with -WRené Scharfe2016-05-311-1/+1
| * | | | | | t4051: rewrite, add more testsRené Scharfe2016-05-316-74/+240
* | | | | | | Merge branch 'jk/rev-list-count-with-bitmap'Junio C Hamano2016-06-201-0/+6
|\ \ \ \ \ \ \
| * | | | | | | rev-list: "adjust" results of "--count --use-bitmap-index -n"Jeff King2016-06-031-0/+6
* | | | | | | | Merge branch 'wd/userdiff-css'Junio C Hamano2016-06-2013-0/+76
|\ \ \ \ \ \ \ \
| * | | | | | | | userdiff: add built-in pattern for CSSwd/userdiff-cssWilliam Duclot2016-06-0313-0/+76
* | | | | | | | | Merge branch 'jg/dash-is-last-branch-in-worktree-add'Junio C Hamano2016-06-201-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | worktree: allow "-" short-hand for @{-1} in add commandjg/dash-is-last-branch-in-worktree-addJordan DE GEA2016-05-311-0/+16
* | | | | | | | | | Merge branch 'et/pretty-format-c-auto'Junio C Hamano2016-06-201-7/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format_commit_message: honor `color=auto` for `%C(auto)`et/pretty-format-c-autoEdward Thomson2016-05-271-7/+19
* | | | | | | | | | | Merge branch 'sb/submodule-recommend-shallowness'Junio C Hamano2016-06-201-0/+52
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule update: learn `--[no-]recommend-shallow` optionStefan Beller2016-05-271-0/+52
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ah/no-verify-signature-with-pull-rebase'Junio C Hamano2016-06-201-0/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebaseAlexander Hirsch2016-05-201-0/+16
* | | | | | | | | | | | Merge branch 'ew/fast-import-unpack-limit'Junio C Hamano2016-06-202-0/+107
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | fast-import: invalidate pack_id references after looseningew/fast-import-unpack-limitEric Wong2016-05-291-0/+57
| * | | | | | | | | | | fast-import: implement unpack limitEric Wong2016-05-112-0/+50
* | | | | | | | | | | | Merge branch 'jk/shell-portability'Junio C Hamano2016-06-104-4/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5500 & t7403: lose bash-ism "local"jk/shell-portabilityJunio C Hamano2016-06-012-3/+2
| * | | | | | | | | | | | test-lib: add in-shell "env" replacementJeff King2016-06-012-1/+23
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/t2300-setup'Junio C Hamano2016-06-101-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | t2300: run git-sh-setup in an environment that better mimics the real lifeJunio C Hamano2016-06-011-1/+2
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-05-311-1/+23
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maintJunio C Hamano2016-05-312-3/+16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-261-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/windows-dotgit' into maintJunio C Hamano2016-05-262-0/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lp/typofixes' into maintJunio C Hamano2016-05-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/z-is-gnutar-ism' into maintJunio C Hamano2016-05-262-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/i18n-misc-updates' into maintJunio C Hamano2016-05-261-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status