summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'xy/format-patch-base'Junio C Hamano2017-04-231-1/+1
|\
| * doc: trivial typo in git-format-patch.txtxy/format-patch-baseGiuseppe Bilotta2017-04-171-1/+1
* | Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-04-231-2/+1
|\ \
| * | submodule: remove a superfluous second check for the "new" variableSebastian Schuberth2017-04-171-2/+1
* | | Merge branch 'jt/fetch-pack-error-reporting'Junio C Hamano2017-04-232-1/+8
|\ \ \
| * | | fetch-pack: show clearer error message upon ERRjt/fetch-pack-error-reportingJonathan Tan2017-04-172-1/+8
* | | | Merge branch 'km/t1400-modernization'Junio C Hamano2017-04-231-168/+167
|\ \ \ \
| * | | | t1400: use consistent style for test_expect_success callskm/t1400-modernizationKyle Meyer2017-04-161-168/+167
* | | | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2017-04-235-1/+49
|\ \ \ \ \
| * | | | | refs: reject ref updates while GIT_QUARANTINE_PATH is setjk/quarantine-received-objectsJeff King2017-04-163-1/+19
| * | | | | receive-pack: document user-visible quarantine effectsJeff King2017-04-162-0/+31
| * | | | | receive-pack: drop tmp_objdir_env from run_update_hookJeff King2017-04-161-1/+0
* | | | | | Merge branch 'jk/loose-object-fsck'Junio C Hamano2017-04-231-3/+0
|\ \ \ \ \ \
| * | | | | | sha1_file: remove an used fd variablejk/loose-object-fsckSebastian Schuberth2017-04-161-3/+0
* | | | | | | Merge branch 'bw/submodule-with-bs-path'Junio C Hamano2017-04-232-7/+21
|\ \ \ \ \ \ \
| * | | | | | | submodule: prevent backslash expantion in submodule namesBrandon Williams2017-04-162-7/+21
* | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano2017-04-234-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | read-cache: force_verify_index_checksumJeff Hostetler2017-04-154-0/+23
* | | | | | | | | Merge branch 'jh/unpack-trees-micro-optim'Junio C Hamano2017-04-231-5/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack-trees: avoid duplicate ODB lookups during checkoutjh/unpack-trees-micro-optimJeff Hostetler2017-04-151-5/+33
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jh/string-list-micro-optim'Junio C Hamano2017-04-232-4/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | string-list: use ALLOC_GROW macro when reallocing string_listjh/string-list-micro-optimJeff Hostetler2017-04-152-4/+50
* | | | | | | | | | Merge branch 'nd/conditional-config-include'Junio C Hamano2017-04-238-14/+73
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config: resolve symlinks in conditional include's patternsnd/conditional-config-includeNguyễn Thái Ngọc Duy2017-04-142-3/+57
| * | | | | | | | | | path.c: and an option to call real_path() in expand_user_path()Nguyễn Thái Ngọc Duy2017-04-147-12/+17
* | | | | | | | | | | Merge branch 'dt/http-postbuffer-can-be-large'Junio C Hamano2017-04-235-6/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http.postbuffer: allow full range of ssize_t valuesdt/http-postbuffer-can-be-largeDavid Turner2017-04-135-6/+32
* | | | | | | | | | | | Merge branch 'tb/doc-eol-normalization'Junio C Hamano2017-04-232-4/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitattributes.txt: document how to normalize the line endingstb/doc-eol-normalizationTorsten Bögershausen2017-04-132-4/+28
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sr/http-proxy-configuration-fix'Junio C Hamano2017-04-231-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http: fix the silent ignoring of proxy misconfiguraionsr/http-proxy-configuration-fixSergey Ryazanov2017-04-131-0/+3
| * | | | | | | | | | | | http: honor empty http.proxy option to bypass proxySergey Ryazanov2017-04-131-2/+8
| |/ / / / / / / / / / /
* | | | | | | | | | | | Git 2.13-rc0v2.13.0-rc0Junio C Hamano2017-04-192-1/+36
* | | | | | | | | | | | Merge branch 'jh/memihash-opt'Junio C Hamano2017-04-196-1/+40
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | p0004: make perf test executableChristian Couder2017-04-181-0/+0
| * | | | | | | | | | | | t3008: skip lazy-init test on a single-core boxKevin Willford2017-04-121-3/+11
| * | | | | | | | | | | | test-online-cpus: helper to return cpu countJeff Hostetler2017-04-123-0/+10
| * | | | | | | | | | | | name-hash: fix buffer overrunKevin Willford2017-03-312-1/+22
* | | | | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2017-04-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | doc/revisions: remove brackets from rev^-n shorthandvn/revision-shorthand-for-side-branch-logKyle Meyer2017-04-161-2/+2
* | | | | | | | | | | | | | Merge branch 'sf/putty-w-args'Junio C Hamano2017-04-192-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | connect.c: handle errors from split_cmdlineJeff King2017-04-162-1/+7
* | | | | | | | | | | | | | | Merge branch 'ld/p4-current-branch-fix'Junio C Hamano2017-04-192-9/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-p4: don't use name-rev to get current branchld/p4-current-branch-fixLuke Diamand2017-04-162-7/+2
| * | | | | | | | | | | | | | | git-p4: add read_pipe_text() internal functionLuke Diamand2017-04-161-3/+28
| * | | | | | | | | | | | | | | git-p4: add failing test for name-rev rather than symbolic-refLuke Diamand2017-04-161-0/+16
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs'Junio C Hamano2017-04-191-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t6500: wait for detached auto gc at the end of the test scriptSZEDER Gábor2017-04-161-1/+17
* | | | | | | | | | | | | | | | Merge branch 'bw/attr-pathspec'Junio C Hamano2017-04-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pathspec: fix segfault in clear_pathspecbw/attr-pathspecBrandon Williams2017-04-161-1/+1