summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/submodule-clone-rr'Junio C Hamano2016-09-081-69/+116
|\
| * clone: recursive and reference option triggers submodule alternatessb/submodule-clone-rrStefan Beller2016-08-171-0/+43
| * t7408: merge short tests, factor out testing methodStefan Beller2016-08-121-23/+25
| * t7408: modernize styleStefan Beller2016-08-121-69/+71
* | Merge branch 'jh/status-v2-porcelain'Junio C Hamano2016-09-083-0/+618
|\ \
| * | status: unit tests for --porcelain=v2jh/status-v2-porcelainJeff Hostetler2016-08-121-0/+593
| * | test-lib-functions.sh: add lf_to_nul helperJeff Hostetler2016-08-111-0/+4
| * | status: support --porcelain[=<version>]Jeff Hostetler2016-08-051-0/+21
* | | Merge branch 'rt/help-unknown'Junio C Hamano2016-09-081-0/+52
|\ \ \
| * | | help: make option --help open man pages only for Git commandsrt/help-unknownRalf Thielow2016-08-301-0/+8
| * | | help: introduce option --exclude-guidesRalf Thielow2016-08-301-0/+44
* | | | Merge branch 'cc/receive-pack-limit'Junio C Hamano2016-09-081-0/+55
|\ \ \ \
| * | | | receive-pack: allow a maximum input size to be specifiedcc/receive-pack-limitJeff King2016-08-241-0/+55
* | | | | Merge branch 'jk/format-patch-number-singleton-patch-with-cover'Junio C Hamano2016-09-081-0/+17
|\ \ \ \ \
| * | | | | format-patch: show 0/1 and 1/1 for singleton patch with cover letterjk/format-patch-number-singleton-patch-with-coverJacob Keller2016-08-231-0/+17
* | | | | | Merge branch 'jk/delta-base-cache'Junio C Hamano2016-09-081-0/+31
|\ \ \ \ \ \
| * | | | | | t/perf: add basic perf tests for delta base cacheJeff King2016-08-231-0/+31
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mh/blame-worktree'Junio C Hamano2016-08-311-0/+5
|\ \ \ \ \ \
| * | | | | | blame: fix segfault on untracked filesmh/blame-worktreeThomas Gummerer2016-08-291-0/+5
* | | | | | | Merge branch 'kw/patch-ids-optim'Junio C Hamano2016-08-311-0/+0
|\ \ \ \ \ \ \
| * | | | | | | p3400: make test script executablekw/patch-ids-optimRené Scharfe2016-08-291-0/+0
* | | | | | | | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'Junio C Hamano2016-08-251-0/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | mingw: ensure temporary file handles are not inherited by child processesbw/mingw-avoid-inheriting-fd-to-lockfileBen Wijen2016-08-231-1/+1
| * | | | | | | t6026-merge-attr: child processes must not inherit index.lock handlesBen Wijen2016-08-181-0/+13
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ab/hooks'Junio C Hamano2016-08-191-0/+6
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: respect core.hooksPath in --git-pathab/hooksJohannes Schindelin2016-08-161-0/+6
* | | | | | | | Merge branch 'jk/difftool-command-not-found'Junio C Hamano2016-08-191-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: always honor fatal error exit codesjk/difftool-command-not-foundJohn Keeping2016-08-151-0/+6
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sb/checkout-explit-detach-no-advice'Junio C Hamano2016-08-191-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-151-0/+23
| |/ / / / / / /
* | | | | | | | Merge branch 'tb/t0027-raciness-fix'Junio C Hamano2016-08-191-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | convert: Correct NNO tests and missing `LF will be replaced by CRLF`tb/t0027-raciness-fixTorsten Bögershausen2016-08-141-3/+3
* | | | | | | | | Merge branch 'rs/pull-signed-tag'Junio C Hamano2016-08-191-0/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-131-0/+18
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/test-lint-pathname'Junio C Hamano2016-08-171-1/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathnameJohannes Schindelin2016-08-161-1/+10
| |/ / / / / / / /
| * | | | | | | | Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-121-0/+14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-101-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano2016-08-101-198/+200
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/fbsd-lazy-mtime' into maintJunio C Hamano2016-08-101-1/+16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/t4130-rename-without-ino' into maintJunio C Hamano2016-08-101-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/grep-commandline-vs-configuration' into maintJunio C Hamano2016-08-101-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-101-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/status-suggest-merge-abort' into maintJunio C Hamano2016-08-102-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-082-1/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-083-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-081-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-081-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/push-scrub-url' into maintJunio C Hamano2016-08-081-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \