summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/refs-have-new'Junio C Hamano2015-03-051-0/+30
|\
| * commit: avoid race when creating orphan commitsMichael Haggerty2015-02-171-1/+1
| * commit: add tests of commit racesMichael Haggerty2015-02-171-0/+30
* | Merge branch 'jk/daemon-interpolate'Junio C Hamano2015-03-031-0/+27
|\ \
| * | daemon: sanitize incoming virtual hostnameJeff King2015-02-171-0/+11
| * | t5570: test git-daemon's --interpolated-path optionJeff King2015-02-171-0/+16
* | | Merge branch 'km/send-email-getopt-long-workarounds'Junio C Hamano2015-03-031-5/+5
|\ \ \
| * | | git-send-email.perl: support no- prefix with older GetOptionsKyle J. McKay2015-02-161-5/+5
* | | | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-032-0/+247
|\ \ \ \
| * | | | apply: do not touch a file beyond a symbolic linkJunio C Hamano2015-02-102-4/+91
| * | | | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-101-0/+19
| * | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-101-0/+141
* | | | | Merge branch 'jk/sanity'Junio C Hamano2015-02-264-9/+42
|\ \ \ \ \
| * | | | | test-lib.sh: set prerequisite SANITY by testing what we really needTorsten Bögershausen2015-02-161-3/+22
| * | | | | tests: correct misuses of POSIXPERMJunio C Hamano2015-01-162-5/+14
| * | | | | t/lib-httpd: switch SANITY check for NOT_ROOTJeff King2015-01-162-1/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2015-02-221-0/+8
|\ \ \ \ \
| * | | | | sha1_file: fix iterating loose alternate objectsJonathon Mah2015-02-091-0/+8
* | | | | | Merge branch 'ps/submodule-sanitize-path-upon-add'Junio C Hamano2015-02-221-0/+17
|\ \ \ \ \ \
| * | | | | | git-submodule.sh: fix '/././' path normalizationPatrick Steinhardt2015-02-021-0/+17
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ab/merge-file-prefix'Junio C Hamano2015-02-221-1/+2
|\ \ \ \ \ \
| * | | | | | merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki2015-02-111-1/+2
| |/ / / / /
* | | | | | Merge branch 'jk/config-no-ungetc-eof'Junio C Hamano2015-02-181-0/+9
|\ \ \ \ \ \
| * | | | | | config: do not ungetc EOFJeff King2015-02-051-0/+9
* | | | | | | Merge branch 'ch/new-gpg-drops-rfc-1991'Junio C Hamano2015-02-182-0/+58
|\ \ \ \ \ \ \
| * | | | | | | t/lib-gpg: sanity-check that we can actually signJeff King2015-01-291-0/+2
| * | | | | | | t/lib-gpg: include separate public keys in keyring.gpgJeff King2015-01-292-0/+56
* | | | | | | | Merge branch 'ye/http-accept-language'Junio C Hamano2015-02-181-0/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | http: add Accept-Language header if possibleYi EungJun2015-01-281-0/+42
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jc/t4122-use-test-write-lines'Junio C Hamano2015-02-171-9/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | t4122: use test_write_lines from test-lib-functionsJunio C Hamano2015-01-291-9/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jk/dumb-http-idx-fetch-fix'Junio C Hamano2015-02-171-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | dumb-http: do not pass NULL path to parse_pack_indexJeff King2015-01-271-0/+18
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano2015-02-171-0/+121
|\ \ \ \ \ \ \ \
| * | | | | | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-221-0/+121
| |/ / / / / / /
* | | | | | | | Merge branch 'ks/rebase-i-abbrev'Junio C Hamano2015-02-171-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase -i: use full object name internally throughout the scriptKirill A. Shutemov2015-01-221-0/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mh/deref-symref-over-helper-transport'Junio C Hamano2015-02-171-0/+24
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | transport-helper: do not request symbolic refs to remote helpersMike Hommey2015-01-221-0/+24
* | | | | | | | Merge branch 'jc/push-to-checkout'Junio C Hamano2015-02-111-0/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | receive-pack: support push-to-checkout hookJunio C Hamano2015-01-081-0/+63
* | | | | | | | | Merge branch 'sb/atomic-push'Junio C Hamano2015-02-111-0/+194
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5543-atomic-push.sh: add basic tests for atomic pushesStefan Beller2015-01-081-0/+194
* | | | | | | | | | Merge branch 'cj/log-invert-grep'Junio C Hamano2015-02-111-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | log: teach --invert-grep optionChristoph Junghans2015-01-131-0/+15
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dk/format-patch-ignore-diff-submodule'Junio C Hamano2015-02-111-0/+72
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: ignore diff.submodule settingDoug Kelly2015-01-081-2/+2
| * | | | | | | | | | t4255: test am submodule with diff.submoduleDoug Kelly2015-01-081-0/+72
* | | | | | | | | | | Merge branch 'ld/p4-exclude-in-sync'Junio C Hamano2015-02-111-0/+71
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: support excluding paths on syncLuke Diamand2015-02-111-0/+71