summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'jk/prune-with-corrupt-refs'Junio C Hamano2015-03-251-0/+114
|\ \ \ \ \ \
| * | | | | | refs.c: drop curate_packed_refsjk/prune-with-corrupt-refsJeff King2015-03-201-1/+1
| * | | | | | repack: turn on "ref paranoia" when doing a destructive repackJeff King2015-03-201-1/+1
| * | | | | | prune: turn on ref_paranoia flagJeff King2015-03-201-2/+2
| * | | | | | t5312: test object deletion code paths in a corrupted repositoryJeff King2015-03-201-0/+114
| * | | | | | Merge branch 'ak/t5516-typofix' into maintJunio C Hamano2015-03-131-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/diff-test-updates' into maintJunio C Hamano2015-03-1311-175/+550
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/diffcore-rename-duplicate' into maintJunio C Hamano2015-03-131-0/+79
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mk/diff-shortstat-dirstat-fix' into maintJunio C Hamano2015-03-131-0/+14
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-beyond-symlink' into maintJunio C Hamano2015-03-132-0/+247
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-interpolate' into maintJunio C Hamano2015-03-131-0/+27
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fetch-pack'Junio C Hamano2015-03-251-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | filter_ref: make a copy of extra "sought" entriesJeff King2015-03-191-3/+10
* | | | | | | | | | | | | | Merge branch 'dj/log-graph-with-no-walk'Junio C Hamano2015-03-254-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | revision: forbid combining --graph and --no-walkdj/log-graph-with-no-walkDongcan Jiang2015-03-194-7/+19
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'kd/rev-list-bisect-first-parent'Junio C Hamano2015-03-251-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rev-list: refuse --first-parent combined with --bisectkd/rev-list-bisect-first-parentKevin Daudt2015-03-191-0/+4
* | | | | | | | | | | | | | | Merge branch 'ct/prompt-untracked-fix'Junio C Hamano2015-03-251-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git prompt: use toplevel to find untracked filesct/prompt-untracked-fixCody A Taylor2015-03-151-0/+11
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'jk/test-annoyances'Junio C Hamano2015-03-235-15/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t5551: make EXPENSIVE test cheaperjk/test-annoyancesJeff King2015-03-121-5/+14
| * | | | | | | | | | | | | | | t5541: move run_with_cmdline_limit to test-lib.shJeff King2015-03-122-6/+6
| * | | | | | | | | | | | | | | t: pass GIT_TRACE through ApacheJeff King2015-03-122-0/+2
| * | | | | | | | | | | | | | | t: redirect stderr GIT_TRACE to descriptor 4Jeff King2015-03-121-4/+1
| * | | | | | | | | | | | | | | t: translate SIGINT to an exitJeff King2015-03-121-0/+1
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/smart-http-hide-refs'Junio C Hamano2015-03-231-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | upload-pack: fix transfer.hiderefs over smart-httpJeff King2015-03-121-0/+11
* | | | | | | | | | | | | | | | Merge branch 'mg/log-decorate-HEAD'Junio C Hamano2015-03-202-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | log: decorate HEAD with branch nameJunio C Hamano2015-03-102-4/+4
| * | | | | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color' into HEADJunio C Hamano2015-03-101-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jc/decorate-leaky-separator-color'Junio C Hamano2015-03-201-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | log --decorate: do not leak "commit" color into the next itemjc/decorate-leaky-separator-colorJunio C Hamano2015-03-041-8/+8
* | | | | | | | | | | | | | | | | Merge branch 'mg/verify-commit'Junio C Hamano2015-03-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t7510: do not fail when gpg warns about insecure memorymg/verify-commitKyle J. McKay2015-03-101-2/+2
* | | | | | | | | | | | | | | | | | Merge branch 'km/bsd-shells'Junio C Hamano2015-03-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | t5528: do not fail with FreeBSD shellkm/bsd-shellsKyle J. McKay2015-03-101-2/+2
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'km/send-email-getopt-long-workarounds' into maintJunio C Hamano2015-03-061-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/merge-file-prefix' into maintJunio C Hamano2015-03-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/submodule-sanitize-path-upon-add' into maintJunio C Hamano2015-03-051-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-03-051-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ch/new-gpg-drops-rfc-1991' into maintJunio C Hamano2015-03-052-0/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-no-ungetc-eof' into maintJunio C Hamano2015-03-051-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/deref-symref-over-helper-transport' into maintJunio C Hamano2015-03-051-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/rebase-i-abbrev' into maintJunio C Hamano2015-03-051-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/sanity' into maintJunio C Hamano2015-03-054-9/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-241-0/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/dumb-http-idx-fetch-fix' into maintJunio C Hamano2015-02-241-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/format-patch-ignore-diff-submodule' into maintJunio C Hamano2015-02-241-0/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/detached-head-report'Junio C Hamano2015-03-201-1/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: name detached HEAD analogous to statusmg/detached-head-reportMichael J Gruber2015-03-061-1/+38
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /