summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* fetch: use "quick" has_sha1_file for tag followingjk/fetch-quick-tag-followingJeff King2016-10-141-0/+99
* Merge branch 'sg/reflog-past-root' into maintJunio C Hamano2016-09-081-1/+0
|\
| * t1410: remove superfluous 'git reflog' from the 'walk past root' testsg/reflog-past-rootSZEDER Gábor2016-08-151-1/+0
* | Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile' into maintJunio C Hamano2016-09-081-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 'jk/difftool-command-not-found' into maintJunio C Hamano2016-09-081-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' into maintJunio C Hamano2016-09-081-0/+23
|\ \ \
| * | | checkout: do not mention detach advice for explicit --detach optionsb/checkout-explit-detach-no-adviceStefan Beller2016-08-151-0/+23
| |/ /
* | | Merge branch 'rs/pull-signed-tag' into maintJunio C Hamano2016-09-081-0/+18
|\ \ \
| * | | merge-recursive: fix verbose output for multiple base treesRené Scharfe2016-08-131-0/+18
| |/ /
* | | Merge branch 'js/test-lint-pathname' into maintJunio C Hamano2016-09-081-1/+10
|\ \ \
| * | | t/Makefile: ensure that paths are valid on platforms we carejs/test-lint-pathnameJohannes Schindelin2016-08-161-1/+10
| |/ /
* | | Merge branch 'jk/push-force-with-lease-creation' into maintJunio C Hamano2016-09-081-0/+38
|\ \ \
| * | | t5533: make it pass on case-sensitive filesystemsjk/push-force-with-lease-creationJohannes Schindelin2016-08-041-1/+1
| * | | push: allow pushing new branches with --force-with-leaseJohn Keeping2016-07-261-0/+12
| * | | push: add shorthand for --force-with-lease branch creationJohn Keeping2016-07-261-0/+26
* | | | Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-081-0/+3
|\ \ \ \
| * | | | date: add "unix" formatJeff King2016-07-271-0/+2
| * | | | date: document and test "raw-local" modeJeff King2016-07-271-0/+1
* | | | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' into maintJunio C Hamano2016-09-083-48/+59
|\ \ \ \ \
| * | | | | merge: avoid "safer crlf" during recording of merge resultsJunio C Hamano2016-07-121-23/+28
| * | | | | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-063-25/+31
* | | | | | Merge branch 'jk/common-main' into maintJunio C Hamano2016-09-0833-43/+43
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Merge branch 'jk/common-main-2.8' into jk/common-mainJunio C Hamano2016-07-0633-40/+40
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano2016-08-121-0/+14
|\ \ \ \ \ \ \
| * | | | | | | difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar2016-07-281-0/+14
| |/ / / / / /
* | | | | | | Merge branch 'rs/use-strbuf-addstr' into maintJunio C Hamano2016-08-101-3/+3
|\ \ \ \ \ \ \
| * | | | | | | use strbuf_addstr() for adding constant strings to a strbufRené Scharfe2016-08-011-3/+3
* | | | | | | | Merge branch 'jk/t4205-cleanup' into maintJunio C Hamano2016-08-101-198/+200
|\ \ \ \ \ \ \ \
| * | | | | | | | t4205: indent here documentsjk/t4205-cleanupJeff King2016-07-271-196/+196
| * | | | | | | | t4205: drop top-level &&-chainingJeff King2016-07-271-2/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/fbsd-lazy-mtime' into maintJunio C Hamano2016-08-101-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | t7063: work around FreeBSD's lazy mtime update featurend/fbsd-lazy-mtimeNguyễn Thái Ngọc Duy2016-08-041-1/+16
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/t4130-rename-without-ino' into maintJunio C Hamano2016-08-101-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | t4130: work around Windows limitationjs/t4130-rename-without-inoJohannes Sixt2016-08-031-3/+7
* | | | | | | | | Merge branch 'jc/grep-commandline-vs-configuration' into maintJunio C Hamano2016-08-101-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grep: further simplify setting the pattern typejc/grep-commandline-vs-configurationJunio C Hamano2016-07-251-0/+14
* | | | | | | | | | Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintJunio C Hamano2016-08-101-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: do not reuse worktree files that need "clean" conversionjk/diff-do-not-reuse-wtf-needs-cleaningJeff King2016-07-221-0/+11
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mm/status-suggest-merge-abort' into maintJunio C Hamano2016-08-102-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abortMatthieu Moy2016-07-222-0/+5
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/submodule-config-code-cleanup' into maintJunio C Hamano2016-08-082-1/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule-config: passing name reference for .gitmodule blobsHeiko Voigt2016-07-281-0/+11
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-08-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/test-lib.sh: fix running tests with --valgrindJohannes Schindelin2016-07-111-1/+1
* | | | | | | | | | | Merge branch 'ah/unpack-trees-advice-messages' into maintJunio C Hamano2016-08-083-7/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messagesAlex Henrie2016-06-273-7/+7
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/pack-ofs-4gb-limit' into maintJunio C Hamano2016-08-081-4/+3
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status