Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | | | | | | | | Merge branch 'rh/hide-prompt-in-ignored-directory' | Junio C Hamano | 2015-01-14 | 1 | -0/+106 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | git-prompt.sh: allow to hide prompt for ignored pwdrh/hide-prompt-in-ignored-directory | Jess Austin | 2015-01-07 | 1 | -0/+106 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'jk/prune-packed-server-info' | Junio C Hamano | 2015-01-14 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | update-server-info: create info/* with mode 0666jk/prune-packed-server-info | Jeff King | 2015-01-06 | 1 | -0/+10 |
| * | | | | | | | | | | | | | | t1301: set umask in reflog sharedrepository=group test | Jeff King | 2015-01-06 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | Merge branch 'js/remote-add-with-insteadof' | Junio C Hamano | 2015-01-14 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add a regression test for 'git remote add <existing> <same-url>'js/remote-add-with-insteadof | Johannes Schindelin | 2014-12-23 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | Merge branch 'es/checkout-index-temp' | Junio C Hamano | 2015-01-12 | 1 | -195/+205 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | checkout-index: fix --temp relative path manglinges/checkout-index-temp | Eric Sunshine | 2014-12-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | t2004: demonstrate broken relative path printing | Eric Sunshine | 2014-12-29 | 1 | -0/+12 |
| * | | | | | | | | | | | | | | | | t2004: standardize file naming in symlink test | Eric Sunshine | 2014-12-29 | 1 | -3/+3 |
| * | | | | | | | | | | | | | | | | t2004: drop unnecessary write-tree/read-tree | Eric Sunshine | 2014-12-29 | 1 | -3/+0 |