Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3jk/http-backend-deadlock-2.3 | Junio C Hamano | 2015-05-25 | 1 | -13/+36 |
|\ | |||||
| * | http-backend: spool ref negotiation requests to bufferjk/http-backend-deadlock-2.2 | Jeff King | 2015-05-25 | 1 | -0/+11 |
| * | t5551: factor out tag creation | Jeff King | 2015-05-20 | 1 | -13/+21 |
* | | t5551: make EXPENSIVE test cheaperjk/test-annoyances | Jeff King | 2015-03-12 | 1 | -5/+14 |
* | | t5541: move run_with_cmdline_limit to test-lib.sh | Jeff King | 2015-03-12 | 2 | -6/+6 |
* | | t: pass GIT_TRACE through Apache | Jeff King | 2015-03-12 | 2 | -0/+2 |
* | | t: redirect stderr GIT_TRACE to descriptor 4 | Jeff King | 2015-03-12 | 1 | -4/+1 |
* | | t: translate SIGINT to an exit | Jeff King | 2015-03-12 | 1 | -0/+1 |
* | | Merge branch 'km/send-email-getopt-long-workarounds' into maint | Junio C Hamano | 2015-03-06 | 1 | -5/+5 |
|\ \ | |||||
| * | | git-send-email.perl: support no- prefix with older GetOptionskm/send-email-getopt-long-workarounds | Kyle J. McKay | 2015-02-16 | 1 | -5/+5 |
* | | | Merge branch 'ab/merge-file-prefix' into maint | Junio C Hamano | 2015-03-05 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | merge-file: correctly open files when in a subdirab/merge-file-prefix | Aleksander Boruch-Gruszecki | 2015-02-11 | 1 | -1/+2 |
* | | | | Merge branch 'ps/submodule-sanitize-path-upon-add' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | git-submodule.sh: fix '/././' path normalizationps/submodule-sanitize-path-upon-add | Patrick Steinhardt | 2015-02-02 | 1 | -0/+17 |
| |/ / / | |||||
* | | | | Merge branch 'jk/prune-mtime' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | sha1_file: fix iterating loose alternate objects | Jonathon Mah | 2015-02-09 | 1 | -0/+8 |
* | | | | | Merge branch 'ch/new-gpg-drops-rfc-1991' into maint | Junio C Hamano | 2015-03-05 | 2 | -0/+58 |
|\ \ \ \ \ | |||||
| * | | | | | t/lib-gpg: sanity-check that we can actually signch/new-gpg-drops-rfc-1991 | Jeff King | 2015-01-29 | 1 | -0/+2 |
| * | | | | | t/lib-gpg: include separate public keys in keyring.gpg | Jeff King | 2015-01-29 | 2 | -0/+56 |
* | | | | | | Merge branch 'jk/config-no-ungetc-eof' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: do not ungetc EOF | Jeff King | 2015-02-05 | 1 | -0/+9 |
* | | | | | | | Merge branch 'mh/deref-symref-over-helper-transport' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | transport-helper: do not request symbolic refs to remote helpersmh/deref-symref-over-helper-transport | Mike Hommey | 2015-01-21 | 1 | -0/+24 |
* | | | | | | | | Merge branch 'ks/rebase-i-abbrev' into maint | Junio C Hamano | 2015-03-05 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase -i: use full object name internally throughout the scriptks/rebase-i-abbrev | Kirill A. Shutemov | 2015-01-22 | 1 | -0/+7 |
* | | | | | | | | | Merge branch 'jk/sanity' into maint | Junio C Hamano | 2015-03-05 | 4 | -9/+42 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | test-lib.sh: set prerequisite SANITY by testing what we really need | Torsten Bögershausen | 2015-02-15 | 1 | -3/+22 |
| * | | | | | | | | | tests: correct misuses of POSIXPERM | Junio C Hamano | 2015-01-16 | 2 | -5/+14 |
| * | | | | | | | | | t/lib-httpd: switch SANITY check for NOT_ROOT | Jeff King | 2015-01-16 | 2 | -1/+6 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+121 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | apply: make update_pre_post_images() sanity check the given postlen | Junio C Hamano | 2015-01-22 | 1 | -0/+121 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jk/dumb-http-idx-fetch-fix' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | dumb-http: do not pass NULL path to parse_pack_indexjk/dumb-http-idx-fetch-fix | Jeff King | 2015-01-27 | 1 | -0/+18 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'dk/format-patch-ignore-diff-submodule' into maint | Junio C Hamano | 2015-02-24 | 1 | -0/+72 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | format-patch: ignore diff.submodule settingdk/format-patch-ignore-diff-submodule | Doug Kelly | 2015-01-07 | 1 | -2/+2 |
| * | | | | | | | | t4255: test am submodule with diff.submodule | Doug Kelly | 2015-01-07 | 1 | -0/+72 |
* | | | | | | | | | Merge branch 'js/t1050' | Junio C Hamano | 2015-01-22 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t1050-large: generate large files without ddjs/t1050 | Johannes Sixt | 2015-01-14 | 1 | -6/+6 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'mg/add-ignore-errors' into maint | Junio C Hamano | 2015-01-12 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint | Junio C Hamano | 2015-01-12 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/for-each-reflog-ent-reverse' into maint | Junio C Hamano | 2015-01-12 | 1 | -0/+30 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jh/empty-notes' | Junio C Hamano | 2015-01-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix unclosed here document in t3301.shjh/empty-notes | Kacper Kornet | 2015-01-22 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2015-01-20 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | parse_color: fix return value for numeric color values 0-8 | Jeff King | 2015-01-20 | 1 | -0/+4 |
* | | | | | | | | | | | | Merge branch 'rc/for-each-ref-tracking' | Junio C Hamano | 2015-01-14 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | for-each-ref: always check stat_tracking_info()'s return valuerc/for-each-ref-tracking | Raphael Kubo da Costa | 2015-01-12 | 1 | -0/+13 |
* | | | | | | | | | | | | | Merge branch 'rh/test-color-avoid-terminfo-in-original-home' | Junio C Hamano | 2015-01-14 | 1 | -44/+48 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | test-lib.sh: do tests for color support after changing HOME | Richard Hansen | 2015-01-07 | 1 | -43/+47 |
| * | | | | | | | | | | | | | test-lib: use 'test ...' instead of '[ ... ]' | Richard Hansen | 2015-01-07 | 1 | -3/+3 |