Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mh/refs-have-new' | Junio C Hamano | 2015-03-05 | 1 | -0/+30 |
|\ | |||||
| * | commit: avoid race when creating orphan commits | Michael Haggerty | 2015-02-17 | 1 | -1/+1 |
| * | commit: add tests of commit races | Michael Haggerty | 2015-02-17 | 1 | -0/+30 |
* | | Merge branch 'jk/daemon-interpolate' | Junio C Hamano | 2015-03-03 | 1 | -0/+27 |
|\ \ | |||||
| * | | daemon: sanitize incoming virtual hostname | Jeff King | 2015-02-17 | 1 | -0/+11 |
| * | | t5570: test git-daemon's --interpolated-path option | Jeff King | 2015-02-17 | 1 | -0/+16 |
* | | | Merge branch 'km/send-email-getopt-long-workarounds' | Junio C Hamano | 2015-03-03 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | git-send-email.perl: support no- prefix with older GetOptions | Kyle J. McKay | 2015-02-16 | 1 | -5/+5 |
* | | | | Merge branch 'jc/apply-beyond-symlink' | Junio C Hamano | 2015-03-03 | 2 | -0/+247 |
|\ \ \ \ | |||||
| * | | | | apply: do not touch a file beyond a symbolic link | Junio C Hamano | 2015-02-10 | 2 | -4/+91 |
| * | | | | apply: do not read from beyond a symbolic link | Junio C Hamano | 2015-02-10 | 1 | -0/+19 |
| * | | | | apply: reject input that touches outside the working area | Junio C Hamano | 2015-02-10 | 1 | -0/+141 |
* | | | | | Merge branch 'jk/sanity' | Junio C Hamano | 2015-02-26 | 4 | -9/+42 |
|\ \ \ \ \ | |||||
| * | | | | | test-lib.sh: set prerequisite SANITY by testing what we really need | Torsten Bögershausen | 2015-02-16 | 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 'jk/prune-mtime' | Junio C Hamano | 2015-02-22 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | sha1_file: fix iterating loose alternate objects | Jonathon Mah | 2015-02-09 | 1 | -0/+8 |
* | | | | | | Merge branch 'ps/submodule-sanitize-path-upon-add' | Junio C Hamano | 2015-02-22 | 1 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-submodule.sh: fix '/././' path normalization | Patrick Steinhardt | 2015-02-02 | 1 | -0/+17 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'ab/merge-file-prefix' | Junio C Hamano | 2015-02-22 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | merge-file: correctly open files when in a subdir | Aleksander Boruch-Gruszecki | 2015-02-11 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jk/config-no-ungetc-eof' | Junio C Hamano | 2015-02-18 | 1 | -0/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | config: do not ungetc EOF | Jeff King | 2015-02-05 | 1 | -0/+9 |
* | | | | | | | Merge branch 'ch/new-gpg-drops-rfc-1991' | Junio C Hamano | 2015-02-18 | 2 | -0/+58 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/lib-gpg: sanity-check that we can actually sign | 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 'ye/http-accept-language' | Junio C Hamano | 2015-02-18 | 1 | -0/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | http: add Accept-Language header if possible | Yi EungJun | 2015-01-28 | 1 | -0/+42 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/t4122-use-test-write-lines' | Junio C Hamano | 2015-02-17 | 1 | -9/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t4122: use test_write_lines from test-lib-functions | Junio C Hamano | 2015-01-29 | 1 | -9/+2 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/dumb-http-idx-fetch-fix' | Junio C Hamano | 2015-02-17 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | dumb-http: do not pass NULL path to parse_pack_index | Jeff King | 2015-01-27 | 1 | -0/+18 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/apply-ws-fix-expands' | Junio C Hamano | 2015-02-17 | 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 'ks/rebase-i-abbrev' | Junio C Hamano | 2015-02-17 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase -i: use full object name internally throughout the script | Kirill A. Shutemov | 2015-01-22 | 1 | -0/+7 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'mh/deref-symref-over-helper-transport' | Junio C Hamano | 2015-02-17 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | transport-helper: do not request symbolic refs to remote helpers | Mike Hommey | 2015-01-22 | 1 | -0/+24 |
* | | | | | | | | Merge branch 'jc/push-to-checkout' | Junio C Hamano | 2015-02-11 | 1 | -0/+63 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | receive-pack: support push-to-checkout hook | Junio C Hamano | 2015-01-08 | 1 | -0/+63 |
* | | | | | | | | | Merge branch 'sb/atomic-push' | Junio C Hamano | 2015-02-11 | 1 | -0/+194 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5543-atomic-push.sh: add basic tests for atomic pushes | Stefan Beller | 2015-01-08 | 1 | -0/+194 |
* | | | | | | | | | | Merge branch 'cj/log-invert-grep' | Junio C Hamano | 2015-02-11 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | log: teach --invert-grep option | Christoph Junghans | 2015-01-13 | 1 | -0/+15 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'dk/format-patch-ignore-diff-submodule' | Junio C Hamano | 2015-02-11 | 1 | -0/+72 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | format-patch: ignore diff.submodule setting | Doug Kelly | 2015-01-08 | 1 | -2/+2 |
| * | | | | | | | | | | t4255: test am submodule with diff.submodule | Doug Kelly | 2015-01-08 | 1 | -0/+72 |
* | | | | | | | | | | | Merge branch 'ld/p4-exclude-in-sync' | Junio C Hamano | 2015-02-11 | 1 | -0/+71 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-p4: support excluding paths on sync | Luke Diamand | 2015-02-11 | 1 | -0/+71 |